lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-12-27 12:35:21 -05:00
Code Issues Releases Wiki Activity

detect actual address type for domain address type

Browse Source
This commit is contained in:
Darien Raymond
2017-02-22 10:24:04 +01:00
parent e480091388
commit 6363c33790
3 changed files with 33 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
proxy/socks/protocol.go
View File

@@ -159,7 +159,7 @@ func (s *ServerSession) Handshake(reader io.Reader, writer io.Writer) (*protocol
if err := buffer.AppendSupplier(buf.ReadFullFrom(reader, domainLength)); err != nil {
return nil, err
}
request.Address = v2net.DomainAddress(string(buffer.BytesFrom(-domainLength)))
request.Address = v2net.ParseAddress(string(buffer.BytesFrom(-domainLength)))
default:
return nil, errors.New("Socks|Server: Unknown address type: ", addrType)
}
@@ -400,10 +400,10 @@ func ClientHandshake(request *protocol.RequestHeader, reader io.Reader, writer i
}
if b.Byte(0) != socks5Version {
return nil, errors.New("Socks|Client: Unexpected server version: ", b.Byte(0))
return nil, errors.New("Socks|Client: Unexpected server version: ", b.Byte(0)).RequireUserAction()
}
if b.Byte(1) != authByte {
return nil, errors.New("Socks|Client: auth method not supported.")
return nil, errors.New("Socks|Client: auth method not supported.").RequireUserAction()
}
if authByte == authPassword {