github/v2ray-core
4
0
Fork 0
mirror of https://github.com/v2ray/v2ray-core.git synced 2026-10-30 00:11:23 +00:00
Code Issues Releases Wiki Activity

remove buffer.WriteBytes

Browse Source
This commit is contained in:
Darien Raymond
2018-11-14 22:55:20 +01:00
parent ff7e5a7cdb
commit 6c7dcc35ab
12 changed files with 89 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
proxy/blackhole/config.go
+1 -1
View File
@@ -27,7 +27,7 @@ func (*NoneResponse) WriteTo(buf.Writer) int32 { return 0 }
// WriteTo implements ResponseConfig.WriteTo().
func (*HTTPResponse) WriteTo(writer buf.Writer) int32 {
b := buf.New()
common.Must2(b.Write([]byte(http403response)))
common.Must2(b.WriteString(http403response))
n := b.Len()
writer.WriteMultiBuffer(buf.NewMultiBufferValue(b))
return n
proxy/shadowsocks/ota_test.go
+1 -2
View File
@@ -12,8 +12,7 @@ func TestNormalChunkReading(t *testing.T) {
assert := With(t)
buffer := buf.New()
buffer.WriteBytes(
0, 8, 39, 228, 69, 96, 133, 39, 254, 26, 201, 70, 11, 12, 13, 14, 15, 16, 17, 18)
buffer.Write([]byte{0, 8, 39, 228, 69, 96, 133, 39, 254, 26, 201, 70, 11, 12, 13, 14, 15, 16, 17, 18})
reader := NewChunkReader(buffer, NewAuthenticator(ChunkKeyGenerator(
[]byte{21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36})))
payload, err := reader.ReadMultiBuffer()
proxy/socks/protocol.go
+11 -9
View File
@@ -255,7 +255,7 @@ func writeSocks5Response(writer io.Writer, errCode byte, address net.Address, po
buffer := buf.New()
defer buffer.Release()
common.Must2(buffer.WriteBytes(socks5Version, errCode, 0x00 /* reserved */))
common.Must2(buffer.Write([]byte{socks5Version, errCode, 0x00 /* reserved */}))
if err := addrParser.WriteAddressPort(buffer, address, port); err != nil {
return err
}
@@ -267,7 +267,8 @@ func writeSocks4Response(writer io.Writer, errCode byte, address net.Address, po
buffer := buf.New()
defer buffer.Release()
common.Must2(buffer.WriteBytes(0x00, errCode))
common.Must(buffer.WriteByte(0x00))
common.Must(buffer.WriteByte(errCode))
common.Must2(serial.WriteUint16(buffer, port.Value()))
common.Must2(buffer.Write(address.IP()))
return buf.WriteAllBytes(writer, buffer.Bytes())
@@ -300,7 +301,7 @@ func DecodeUDPPacket(packet *buf.Buffer) (*protocol.RequestHeader, error) {
func EncodeUDPPacket(request *protocol.RequestHeader, data []byte) (*buf.Buffer, error) {
b := buf.New()
common.Must2(b.WriteBytes(0, 0, 0 /* Fragment */))
common.Must2(b.Write([]byte{0, 0, 0 /* Fragment */}))
if err := addrParser.WriteAddressPort(b, request.Address, request.Port); err != nil {
b.Release()
return nil, err
@@ -362,14 +363,15 @@ func ClientHandshake(request *protocol.RequestHeader, reader io.Reader, writer i
b := buf.New()
defer b.Release()
common.Must2(b.WriteBytes(socks5Version, 0x01, authByte))
common.Must2(b.Write([]byte{socks5Version, 0x01, authByte}))
if authByte == authPassword {
account := request.User.Account.(*Account)
common.Must2(b.WriteBytes(0x01, byte(len(account.Username))))
common.Must2(b.Write([]byte(account.Username)))
common.Must2(b.WriteBytes(byte(len(account.Password))))
common.Must2(b.Write([]byte(account.Password)))
common.Must(b.WriteByte(0x01))
common.Must(b.WriteByte(byte(len(account.Username))))
common.Must2(b.WriteString(account.Username))
common.Must(b.WriteByte(byte(len(account.Password))))
common.Must2(b.WriteString(account.Password))
}
if err := buf.WriteAllBytes(writer, b.Bytes()); err != nil {
@@ -404,7 +406,7 @@ func ClientHandshake(request *protocol.RequestHeader, reader io.Reader, writer i
if request.Command == protocol.RequestCommandUDP {
command = byte(cmdUDPPort)
}
common.Must2(b.WriteBytes(socks5Version, command, 0x00 /* reserved */))
common.Must2(b.Write([]byte{socks5Version, command, 0x00 /* reserved */}))
if err := addrParser.WriteAddressPort(b, request.Address, request.Port); err != nil {
return nil, err
}
proxy/vmess/encoding/client.go
+4 -3
View File
@@ -65,14 +65,15 @@ func (c *ClientSession) EncodeRequestHeader(header *protocol.RequestHeader, writ
buffer := buf.New()
defer buffer.Release()
common.Must2(buffer.WriteBytes(Version))
common.Must(buffer.WriteByte(Version))
common.Must2(buffer.Write(c.requestBodyIV[:]))
common.Must2(buffer.Write(c.requestBodyKey[:]))
common.Must2(buffer.WriteBytes(c.responseHeader, byte(header.Option)))
common.Must(buffer.WriteByte(c.responseHeader))
common.Must(buffer.WriteByte(byte(header.Option)))
padingLen := dice.Roll(16)
security := byte(padingLen<<4) | byte(header.Security)
common.Must2(buffer.WriteBytes(security, byte(0), byte(header.Command)))
common.Must2(buffer.Write([]byte{security, byte(0), byte(header.Command)}))
if header.Command != protocol.RequestCommandMux {
if err := addrParser.WriteAddressPort(buffer, header.Address, header.Port); err != nil {