GuanM/hysteria
1
0
Fork 0
mirror of https://github.com/cedar2025/hysteria.git synced 2025-06-24 13:39:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: use local address from TCP connection for SOCKS5 UDP

Browse Source
This commit is contained in:
Toby 2021-12-03 23:00:27 -08:00
parent c811b8e558
commit 50bee6c694
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/socks5/server.go
View File

@ -52,9 +52,6 @@ func NewServer(hyClient *core.Client, transport transport.Transport, addr string
if err != nil {
return nil, err
}
if tAddr.IP == nil || tAddr.IP.IsUnspecified() {
return nil, errors.New("listen address must have a specified IP")
}
m := socks5.MethodNone
if authFunc != nil {
m = socks5.MethodUsernamePassword
@ -274,12 +271,23 @@ func (s *Server) handleUDP(c *net.TCPConn, r *socks5.Request) error {
}
defer hyUDP.Close()
// Send UDP server addr to the client
atyp, addr, port, err := socks5.ParseAddress(udpConn.LocalAddr().String())
if err != nil {
// Same IP as TCP but a different port
tcpLocalAddr := c.LocalAddr().(*net.TCPAddr)
var atyp byte
var addr, port []byte
if ip4 := tcpLocalAddr.IP.To4(); ip4 != nil {
atyp = socks5.ATYPIPv4
addr = ip4
} else if ip6 := tcpLocalAddr.IP.To16(); ip6 != nil {
atyp = socks5.ATYPIPv6
addr = ip6
} else {
_ = sendReply(c, socks5.RepServerFailure)
closeErr = err
return err
closeErr = errors.New("invalid local addr")
return closeErr
}
port = make([]byte, 2)
binary.BigEndian.PutUint16(port, uint16(udpConn.LocalAddr().(*net.UDPAddr).Port))
_, _ = socks5.NewReply(socks5.RepSuccess, atyp, addr, port).WriteTo(c)
// Let UDP server do its job, we hold the TCP connection here
go s.udpServer(udpConn, localRelayConn, hyUDP)