mirrors/hysteria
1
0
Fork 0
mirror of https://github.com/apernet/hysteria.git synced 2025-04-03 20:47:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix: socks5 udp listen addr when omitting address & udp domain

Browse source
This commit is contained in:
tobyxdd 2023-06-11 16:22:42 -07:00
parent ca82106dc4
commit da63981d96
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/socks5/server.go
View file

@ -254,9 +254,11 @@ func (s *Server) handleUDP(c *net.TCPConn, r *socks5.Request) error {
s.UDPErrorFunc(c.RemoteAddr(), closeErr) s.UDPErrorFunc(c.RemoteAddr(), closeErr)
}() }()
// Start local UDP server // Start local UDP server
// Bind to the same address that the incoming TCP connection is sending to
udpConn, err := net.ListenUDP("udp", &net.UDPAddr{ udpConn, err := net.ListenUDP("udp", &net.UDPAddr{
IP: s.TCPAddr.IP, IP: c.LocalAddr().(*net.TCPAddr).IP,
Zone: s.TCPAddr.Zone, Zone: c.LocalAddr().(*net.TCPAddr).Zone,
Port: 0, // Random port
}) })
if err != nil { if err != nil {
_ = sendReply(c, socks5.RepServerFailure) _ = sendReply(c, socks5.RepServerFailure)
@ -348,6 +350,9 @@ func (s *Server) udpServer(clientConn, localRelayConn *net.UDPConn, hyUDP cs.HyU
if err != nil { if err != nil {
continue continue
} }
if atyp == socks5.ATYPDomain {
addr = addr[1:] // Remove the leading length byte
}
d := socks5.NewDatagram(atyp, addr, port, bs) d := socks5.NewDatagram(atyp, addr, port, bs)
_, _ = clientConn.WriteToUDP(d.Bytes(), clientAddr) _, _ = clientConn.WriteToUDP(d.Bytes(), clientAddr)
} }
@ -362,6 +367,9 @@ func (s *Server) udpServer(clientConn, localRelayConn *net.UDPConn, hyUDP cs.HyU
if err != nil { if err != nil {
continue continue
} }
if atyp == socks5.ATYPDomain {
addr = addr[1:] // Remove the leading length byte
}
d := socks5.NewDatagram(atyp, addr, port, buf[:n]) d := socks5.NewDatagram(atyp, addr, port, buf[:n])
_, _ = clientConn.WriteToUDP(d.Bytes(), clientAddr) _, _ = clientConn.WriteToUDP(d.Bytes(), clientAddr)
} }