bughz/glider
1
0
Fork 0
mirror of https://github.com/nadoo/glider.git synced 2025-11-04 07:42:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

socks5: fixed a bug in dialudp

Browse Source
This commit is contained in:
nadoo 2018-01-22 22:40:38 +08:00
parent b35da7048d
commit d8a78df402
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
socks5.go
View File

@ -239,7 +239,6 @@ func (s *SOCKS5) Dial(network, addr string) (net.Conn, error) {
// DialUDP connects to the given address via the proxy. // DialUDP connects to the given address via the proxy.
func (s *SOCKS5) DialUDP(network, addr string) (pc net.PacketConn, writeTo net.Addr, err error) { func (s *SOCKS5) DialUDP(network, addr string) (pc net.PacketConn, writeTo net.Addr, err error) {
// TODO: keep tcp connection until udp ended
c, err := s.cDialer.Dial("tcp", s.addr) c, err := s.cDialer.Dial("tcp", s.addr)
if err != nil { if err != nil {
logf("proxy-socks5 dialudp dial tcp to %s error: %s", s.addr, err) logf("proxy-socks5 dialudp dial tcp to %s error: %s", s.addr, err)
@ -259,11 +258,11 @@ func (s *SOCKS5) DialUDP(network, addr string) (pc net.PacketConn, writeTo net.A
return nil, nil, err return nil, nil, err
} }
dstAddr := ParseAddr(s.Addr()) dstAddr := ParseAddr(addr)
// write VER CMD RSV ATYP DST.ADDR DST.PORT // write VER CMD RSV ATYP DST.ADDR DST.PORT
c.Write(append([]byte{5, socks5UDPAssociate, 0}, dstAddr...)) c.Write(append([]byte{5, socks5UDPAssociate, 0}, dstAddr...))
// read VER REP RSV ATYP DST.ADDR DST.PORT // read VER REP RSV ATYP BND.ADDR BND.PORT
if _, err := io.ReadFull(c, buf[:3]); err != nil { if _, err := io.ReadFull(c, buf[:3]); err != nil {
return nil, nil, err return nil, nil, err
} }
@ -279,15 +278,13 @@ func (s *SOCKS5) DialUDP(network, addr string) (pc net.PacketConn, writeTo net.A
return nil, nil, err return nil, nil, err
} }
logf("proxy-socks5 udp dial uAddr: %s", uAddr)
pc, nextHop, err := s.cDialer.DialUDP(network, uAddr.String()) pc, nextHop, err := s.cDialer.DialUDP(network, uAddr.String())
if err != nil { if err != nil {
logf("proxy-socks5 dialudp to %s error: %s", uAddr.String(), err) logf("proxy-socks5 dialudp to %s error: %s", uAddr.String(), err)
return nil, nil, err return nil, nil, err
} }
pkc := NewSocks5PktConn(pc, nextHop, ParseAddr(addr), true, c) pkc := NewSocks5PktConn(pc, nextHop, dstAddr, true, c)
return pkc, nextHop, err return pkc, nextHop, err
} }