Fix socks5 udp associate address

SagerNet · Apr 10, 2024 · c471471 · c471471
1 parent 2fa0399
commit c471471
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/protocol/socks/handshake.go b/protocol/socks/handshake.go
@@ -76,6 +76,13 @@ func ClientHandshake5(conn io.ReadWriter, command byte, destination M.Socksaddr,
 	} else if authResponse.Method != socks5.AuthTypeNotRequired {
 		return socks5.Response{}, E.New("socks5: unsupported auth method: ", authResponse.Method)
 	}
+	if command == socks5.CommandUDPAssociate {
+		if destination.IsIPv6() {
+			destination = M.SocksaddrFrom(netip.IPv6Unspecified(), 0)
+		} else {
+			destination = M.SocksaddrFrom(netip.IPv4Unspecified(), 0)
+		}
+	}
 	err = socks5.WriteRequest(conn, socks5.Request{
 		Command:     command,
 		Destination: destination,
@@ -215,6 +222,11 @@ func HandleConnection0(ctx context.Context, conn net.Conn, version byte, authent
 			if err != nil {
 				return err
 			}
+			if request.Destination.IsIPv6() {
+				request.Destination = M.SocksaddrFrom(netip.IPv6Unspecified(), 0)
+			} else {
+				request.Destination = M.SocksaddrFrom(netip.IPv4Unspecified(), 0)
+			}
 			metadata.Protocol = "socks5"
 			metadata.Destination = request.Destination
 			var innerError error