From 858d36cf30827039f23758911f64c1e8ef007f87 Mon Sep 17 00:00:00 2001 From: Toby Date: Sun, 23 Jan 2022 17:40:59 -0800 Subject: [PATCH] chore: remove useless laddr from ListenUDP --- pkg/core/server_client.go | 2 +- pkg/socks5/server.go | 2 +- pkg/transport/client.go | 4 ++-- pkg/transport/server.go | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/core/server_client.go b/pkg/core/server_client.go index 40e2649..9a96046 100644 --- a/pkg/core/server_client.go +++ b/pkg/core/server_client.go @@ -264,7 +264,7 @@ func (c *serverClient) handleTCP(stream quic.Stream, host string, port uint16) { func (c *serverClient) handleUDP(stream quic.Stream) { // Like in SOCKS5, the stream here is only used to maintain the UDP session. No need to read anything from it - conn, err := c.Transport.ListenUDP(nil) + conn, err := c.Transport.ListenUDP() if err != nil { _ = struc.Pack(stream, &serverResponse{ OK: false, diff --git a/pkg/socks5/server.go b/pkg/socks5/server.go index 8adcc6a..f3a2a62 100644 --- a/pkg/socks5/server.go +++ b/pkg/socks5/server.go @@ -264,7 +264,7 @@ func (s *Server) handleUDP(c *net.TCPConn, r *socks5.Request) error { // Local UDP relay conn for ACL Direct var localRelayConn *net.UDPConn if s.ACLEngine != nil { - localRelayConn, err = s.Transport.ListenUDP(nil) + localRelayConn, err = s.Transport.ListenUDP() if err != nil { _ = sendReply(c, socks5.RepServerFailure) closeErr = err diff --git a/pkg/transport/client.go b/pkg/transport/client.go index ec91059..0191415 100644 --- a/pkg/transport/client.go +++ b/pkg/transport/client.go @@ -91,6 +91,6 @@ func (ct *ClientTransport) DialTCP(raddr *net.TCPAddr) (*net.TCPConn, error) { return conn.(*net.TCPConn), nil } -func (ct *ClientTransport) ListenUDP(laddr *net.UDPAddr) (*net.UDPConn, error) { - return net.ListenUDP("udp", laddr) +func (ct *ClientTransport) ListenUDP() (*net.UDPConn, error) { + return net.ListenUDP("udp", nil) } diff --git a/pkg/transport/server.go b/pkg/transport/server.go index 42985d0..fc003c4 100644 --- a/pkg/transport/server.go +++ b/pkg/transport/server.go @@ -100,6 +100,6 @@ func (ct *ServerTransport) DialTCP(raddr *net.TCPAddr) (*net.TCPConn, error) { return conn.(*net.TCPConn), nil } -func (ct *ServerTransport) ListenUDP(laddr *net.UDPAddr) (*net.UDPConn, error) { - return net.ListenUDP("udp", laddr) +func (ct *ServerTransport) ListenUDP() (*net.UDPConn, error) { + return net.ListenUDP("udp", nil) }