package/tun2socks
1
0
Fork 0
mirror of https://github.com/xjasonlyu/tun2socks.git synced 2025-10-13 04:24:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Chore: minor improvement

Browse Source
This commit is contained in:
xjasonlyu
2021-09-05 23:34:02 +08:00
parent a86608e31a
commit 05f4938053
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
transport/socks5/socks5.go
View File

@@ -148,15 +148,16 @@ type User struct {
// ClientHandshake fast-tracks SOCKS initialization to get target address to connect on client side. // ClientHandshake fast-tracks SOCKS initialization to get target address to connect on client side.
func ClientHandshake(rw io.ReadWriter, addr Addr, command Command, user *User) (Addr, error) { func ClientHandshake(rw io.ReadWriter, addr Addr, command Command, user *User) (Addr, error) {
buf := make([]byte, MaxAddrLen) buf := make([]byte, MaxAddrLen)
var err error
var method uint8
if user != nil {
method = 0x02 /* USERNAME/PASSWORD */
} else {
method = 0x00 /* NO AUTHENTICATION REQUIRED */
}
// VER, NMETHODS, METHODS // VER, NMETHODS, METHODS
if user != nil { if _, err := rw.Write([]byte{Version, 0x01 /* NMETHODS */, method}); err != nil {
_, err = rw.Write([]byte{Version, 0x01 /* NMETHODS */, 0x02 /* USERNAME/PASSWORD */})
} else {
_, err = rw.Write([]byte{Version, 0x01 /* NMETHODS */, 0x00 /* NO AUTHENTICATION REQUIRED */})
}
if err != nil {
return nil, err return nil, err
} }
@@ -213,7 +214,7 @@ func ClientHandshake(rw io.ReadWriter, addr Addr, command Command, user *User) (
} }
if rep := Reply(buf[1]); rep != 0x00 /* SUCCEEDED */ { if rep := Reply(buf[1]); rep != 0x00 /* SUCCEEDED */ {
return nil, fmt.Errorf("%#X: %s", rep, rep.String()) return nil, fmt.Errorf("%#02x: %s", uint8(rep), rep)
} }
return ReadAddr(rw, buf) return ReadAddr(rw, buf)