bughz/glider
1
0
Fork 0
mirror of https://github.com/nadoo/glider.git synced 2025-02-23 01:15:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix(socks5): should not dial returned bind addr directly (#212)

Browse Source 
* fix(socks5): should not dial returned bind addr directly
When server returns an any ip (0.0.0.0 or [::0]), we should use conventional ip to replace the any ip given (0.0.0.0 or [::0]).
This behaviour adapts to most situations.

See v2fly/v2ray-core#523

* fix: splithostport
This commit is contained in:
mzz 2021-02-07 11:04:58 +08:00 committed by GitHub
parent a310635a9f
commit d2268b623f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
proxy/socks5/client.go
View File

@ -86,9 +86,20 @@ func (s *Socks5) DialUDP(network, addr string) (pc net.PacketConn, writeTo net.A
return nil, nil, err
}
pc, nextHop, err := s.dialer.DialUDP(network, uAddr.String())
var uAddress string
h, p, _ := net.SplitHostPort(uAddr.String())
// if returned bind ip is unspecified
if ip := net.ParseIP(h); ip != nil && ip.IsUnspecified() {
// indicate using conventional addr
h, _, _ = net.SplitHostPort(s.addr)
uAddress = net.JoinHostPort(h, p)
} else {
uAddress = uAddr.String()
}
pc, nextHop, err := s.dialer.DialUDP(network, uAddress)
if err != nil {
log.F("[socks5] dialudp to %s error: %s", uAddr.String(), err)
log.F("[socks5] dialudp to %s error: %s", uAddress, err)
return nil, nil, err
}