fix socks5 outbound udp

p4gefau1t · Jun 30, 2020 · ae8e583 · ae8e583
1 parent 9866c03
commit ae8e583
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/tunnel/freedom/client.go b/tunnel/freedom/client.go
@@ -75,8 +75,9 @@ func (c *Client) DialPacket(tunnel.Tunnel) (tunnel.PacketConn, error) {
 			return nil, common.NewError("freedom recv invalid socks bind addr").Base(err)
 		}
 		return &SocksPacketConn{
-			PacketConn: packetConn,
-			socksAddr:  socksAddr,
+			PacketConn:  packetConn,
+			socksAddr:   socksAddr,
+			socksClient: socksClient,
 		}, nil
 	}
 	network := "udp"

diff --git a/tunnel/freedom/conn.go b/tunnel/freedom/conn.go
@@ -13,21 +13,13 @@ import (
 const MaxPacketSize = 1024 * 8
 
 type Conn struct {
-	socksClient *socks5.Client
 	net.Conn
 }
 
 func (c *Conn) Metadata() *tunnel.Metadata {
 	return nil
 }
 
-func (c *Conn) Close() error {
-	if c.socksClient != nil {
-		c.socksClient.Close()
-	}
-	return c.Conn.Close()
-}
-
 type PacketConn struct {
 	*net.UDPConn
 }
@@ -66,7 +58,8 @@ func (c *PacketConn) WriteTo(p []byte, addr net.Addr) (int, error) {
 
 type SocksPacketConn struct {
 	net.PacketConn
-	socksAddr *net.UDPAddr
+	socksAddr   *net.UDPAddr
+	socksClient *socks5.Client
 }
 
 func (c *SocksPacketConn) WriteWithMetadata(payload []byte, metadata *tunnel.Metadata) (int, error) {
@@ -102,3 +95,8 @@ func (c *SocksPacketConn) ReadWithMetadata(payload []byte) (int, *tunnel.Metadat
 		Address: addr,
 	}, nil
 }
+
+func (c *SocksPacketConn) Close() error {
+	c.socksClient.Close()
+	return c.PacketConn.Close()
+}