lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-01-02 07:26:24 -05:00
Code Issues Releases Wiki Activity

Remove unnecessary code in socks io

Browse Source
This commit is contained in:
V2Ray 2015-09-16 16:06:16 +02:00
parent 7cfcc58f19
commit 6746800a21
2 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
io/socks/socks.go
View File

@ -77,12 +77,8 @@ func NewAuthenticationResponse(authMethod byte) *Socks5AuthenticationResponse {
return response return response
} }
func (r *Socks5AuthenticationResponse) ToBytes() []byte { func WriteAuthentication(writer io.Writer, r *Socks5AuthenticationResponse) error {
return []byte{r.version, r.authMethod} _, err := writer.Write([]byte{r.version, r.authMethod})
}
func WriteAuthentication(writer io.Writer, response *Socks5AuthenticationResponse) error {
_, err := writer.Write(response.ToBytes())
return err return err
} }

12
io/socks/socks_test.go
View File

@ -22,18 +22,6 @@ func TestAuthenticationRequestRead(t *testing.T) {
assert.Byte(request.authMethods[0]).Named("Auth Method").Equals(0x02) assert.Byte(request.authMethods[0]).Named("Auth Method").Equals(0x02)
} }
func TestAuthenticationResponseToBytes(t *testing.T) {
assert := unit.Assert(t)
socksVersion := uint8(5)
authMethod := uint8(1)
response := Socks5AuthenticationResponse{socksVersion, authMethod}
bytes := response.ToBytes()
assert.Byte(bytes[0]).Named("Version").Equals(socksVersion)
assert.Byte(bytes[1]).Named("Auth Method").Equals(authMethod)
}
func TestRequestRead(t *testing.T) { func TestRequestRead(t *testing.T) {
assert := unit.Assert(t) assert := unit.Assert(t)