lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-04-16 18:49:16 -04:00
Code Issues Releases Wiki Activity

remove NewMultiBufferValue

Browse Source
This commit is contained in:
Darien Raymond
2018-11-16 11:08:12 +01:00
parent db5259e75b
commit a01fdc29a6
21 changed files with 33 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proxy/shadowsocks/ota_test.go
View File

@@ -30,7 +30,7 @@ func TestNormalChunkWriting(t *testing.T) {
b := buf.New()
b.Write([]byte{11, 12, 13, 14, 15, 16, 17, 18})
common.Must(writer.WriteMultiBuffer(buf.NewMultiBufferValue(b)))
common.Must(writer.WriteMultiBuffer(buf.MultiBuffer{b}))
if diff := cmp.Diff(buffer.Bytes(), []byte{0, 8, 39, 228, 69, 96, 133, 39, 254, 26, 201, 70, 11, 12, 13, 14, 15, 16, 17, 18}); diff != "" {
t.Error(diff)
}

4
proxy/shadowsocks/protocol.go
View File

@@ -147,7 +147,7 @@ func WriteTCPRequest(request *protocol.RequestHeader, writer io.Writer) (buf.Wri
authenticator.Authenticate(authPayload, authBuffer)
}
if err := w.WriteMultiBuffer(buf.NewMultiBufferValue(header)); err != nil {
if err := w.WriteMultiBuffer(buf.MultiBuffer{header}); err != nil {
return nil, newError("failed to write header").Base(err)
}
@@ -301,7 +301,7 @@ func (v *UDPReader) ReadMultiBuffer() (buf.MultiBuffer, error) {
buffer.Release()
return nil, err
}
return buf.NewMultiBufferValue(payload), nil
return buf.MultiBuffer{payload}, nil
}
type UDPWriter struct {

6
proxy/shadowsocks/protocol_test.go
View File

@@ -118,7 +118,7 @@ func TestTCPRequest(t *testing.T) {
writer, err := WriteTCPRequest(request, cache)
assert(err, IsNil)
assert(writer.WriteMultiBuffer(buf.NewMultiBufferValue(data)), IsNil)
assert(writer.WriteMultiBuffer(buf.MultiBuffer{data}), IsNil)
decodedRequest, reader, err := ReadTCPSession(request.User, cache)
assert(err, IsNil)
@@ -168,7 +168,7 @@ func TestUDPReaderWriter(t *testing.T) {
{
b := buf.New()
common.Must2(b.WriteString("test payload"))
err := writer.WriteMultiBuffer(buf.NewMultiBufferValue(b))
err := writer.WriteMultiBuffer(buf.MultiBuffer{b})
assert(err, IsNil)
payload, err := reader.ReadMultiBuffer()
@@ -179,7 +179,7 @@ func TestUDPReaderWriter(t *testing.T) {
{
b := buf.New()
common.Must2(b.WriteString("test payload 2"))
err := writer.WriteMultiBuffer(buf.NewMultiBufferValue(b))
err := writer.WriteMultiBuffer(buf.MultiBuffer{b})
assert(err, IsNil)
payload, err := reader.ReadMultiBuffer()