From dc27334e9a7deb7ab350d3ddf6045e03fbf2819d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Mon, 19 Jun 2023 13:18:48 +0800 Subject: [PATCH] Unwrap 4in6 address in socks packet conn --- protocol/socks/packet.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/protocol/socks/packet.go b/protocol/socks/packet.go index 8bfba10..08028b0 100644 --- a/protocol/socks/packet.go +++ b/protocol/socks/packet.go @@ -89,15 +89,18 @@ func (c *AssociatePacketConn) Write(b []byte) (n int, err error) { return c.WriteTo(b, c.remoteAddr) } -func (c *AssociatePacketConn) ReadPacket(buffer *buf.Buffer) (M.Socksaddr, error) { - destination, err := c.NetPacketConn.ReadPacket(buffer) +func (c *AssociatePacketConn) ReadPacket(buffer *buf.Buffer) (destination M.Socksaddr, err error) { + destination, err = c.NetPacketConn.ReadPacket(buffer) if err != nil { return M.Socksaddr{}, err } c.remoteAddr = destination buffer.Advance(3) - dest, err := M.SocksaddrSerializer.ReadAddrPort(buffer) - return dest, err + destination, err = M.SocksaddrSerializer.ReadAddrPort(buffer) + if err != nil { + return + } + return destination.Unwrap(), nil } func (c *AssociatePacketConn) WritePacket(buffer *buf.Buffer, destination M.Socksaddr) error {