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

fix: align length

Browse Source
This commit is contained in:
mzz2017 2020-12-13 14:10:11 +08:00
parent 74215066aa
commit dfa3a16e18
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
proxy/socks4/socks4.go
View File

@ -126,7 +126,8 @@ func (s *SOCKS4) connect(conn net.Conn, target string) error {
return errors.New("[socks4] port number out of range: " + portStr) return errors.New("[socks4] port number out of range: " + portStr)
} }
bufSize := 8 const baseBufSize = 8 + 1 // 1 is the len(userid)
bufSize := baseBufSize
var ip net.IP var ip net.IP
if ip = net.ParseIP(host); ip == nil { if ip = net.ParseIP(host); ip == nil {
if s.socks4a { if s.socks4a {
@ -140,8 +141,12 @@ func (s *SOCKS4) connect(conn net.Conn, target string) error {
return err return err
} }
} }
} else {
ip = ip.To4()
if ip == nil {
return errors.New("[socks4] IPv6 is not supported by socks4")
}
} }
// taken from https://github.com/h12w/socks/blob/master/socks.go and https://en.wikipedia.org/wiki/SOCKS // taken from https://github.com/h12w/socks/blob/master/socks.go and https://en.wikipedia.org/wiki/SOCKS
buf := pool.GetBuffer(bufSize) buf := pool.GetBuffer(bufSize)
defer pool.PutBuffer(buf) defer pool.PutBuffer(buf)
@ -154,7 +159,7 @@ func (s *SOCKS4) connect(conn net.Conn, target string) error {
0, // user id 0, // user id
}) })
if s.socks4a { if s.socks4a {
copy(buf[8:], host) copy(buf[baseBufSize:], host)
buf[len(buf)-1] = 0 buf[len(buf)-1] = 0
} }