remove use of Buffer.Value

This commit is contained in:
Darien Raymond
2016-12-05 21:33:24 +01:00
parent 186bf1f141
commit 4bf8288cc2
10 changed files with 21 additions and 22 deletions
+1 -1
View File
@@ -24,7 +24,7 @@ func (v *OutboundConnectionHandler) Dispatch(destination v2net.Destination, payl
v.Destination = destination
if !payload.IsEmpty() {
v.ConnOutput.Write(payload.Value)
v.ConnOutput.Write(payload.Bytes())
}
payload.Release()
+2 -2
View File
@@ -40,14 +40,14 @@ func MarshalCommand(command interface{}, writer io.Writer) error {
return err
}
auth := Authenticate(buffer.Value)
auth := Authenticate(buffer.Bytes())
len := buffer.Len() + 4
if len > 255 {
return ErrCommandTooLarge
}
writer.Write([]byte{cmdId, byte(len), byte(auth >> 24), byte(auth >> 16), byte(auth >> 8), byte(auth)})
writer.Write(buffer.Value)
writer.Write(buffer.Bytes())
return nil
}
+1 -1
View File
@@ -25,7 +25,7 @@ func TestSwitchAccount(t *testing.T) {
err := MarshalCommand(sa, buffer)
assert.Error(err).IsNil()
cmd, err := UnmarshalCommand(1, buffer.Value[2:])
cmd, err := UnmarshalCommand(1, buffer.BytesFrom(2))
assert.Error(err).IsNil()
sa2, ok := cmd.(*protocol.CommandSwitchAccount)
+4 -4
View File
@@ -19,11 +19,11 @@ func TestAuthenticate(t *testing.T) {
buffer := alloc.NewBuffer().Clear()
buffer.AppendBytes(1, 2, 3, 4)
Authenticate(buffer)
assert.Bytes(buffer.Value).Equals([]byte{0, 8, 87, 52, 168, 125, 1, 2, 3, 4})
assert.Bytes(buffer.Bytes()).Equals([]byte{0, 8, 87, 52, 168, 125, 1, 2, 3, 4})
b2, err := NewAuthChunkReader(buffer).Read()
assert.Error(err).IsNil()
assert.Bytes(b2.Value).Equals([]byte{1, 2, 3, 4})
assert.Bytes(b2.Bytes()).Equals([]byte{1, 2, 3, 4})
}
func TestSingleIO(t *testing.T) {
@@ -39,7 +39,7 @@ func TestSingleIO(t *testing.T) {
reader := NewAuthChunkReader(content)
buffer, err := reader.Read()
assert.Error(err).IsNil()
assert.Bytes(buffer.Value).Equals([]byte("abcd"))
assert.String(buffer.String()).Equals("abcd")
}
func TestLargeIO(t *testing.T) {
@@ -73,7 +73,7 @@ func TestLargeIO(t *testing.T) {
break
}
assert.Error(err).IsNil()
actualContent = append(actualContent, buffer.Value...)
actualContent = append(actualContent, buffer.Bytes()...)
}
assert.Int(len(actualContent)).Equals(len(content))
+5 -5
View File
@@ -61,9 +61,9 @@ func (v *AuthChunkReader) Read() (*alloc.Buffer, error) {
return nil, io.ErrUnexpectedEOF
}
}
length := serial.BytesToUint16(buffer.Value[:2])
length := serial.BytesToUint16(buffer.BytesTo(2))
v.chunkLength = int(length) - 4
v.validator = NewValidator(serial.BytesToUint32(buffer.Value[2:6]))
v.validator = NewValidator(serial.BytesToUint32(buffer.BytesRange(2, 6)))
buffer.SliceFrom(6)
if buffer.Len() < v.chunkLength && v.chunkLength <= 2048 {
_, err := buffer.FillFrom(v.reader)
@@ -86,10 +86,10 @@ func (v *AuthChunkReader) Read() (*alloc.Buffer, error) {
}
if buffer.Len() < v.chunkLength {
v.validator.Consume(buffer.Value)
v.validator.Consume(buffer.Bytes())
v.chunkLength -= buffer.Len()
} else {
v.validator.Consume(buffer.Value[:v.chunkLength])
v.validator.Consume(buffer.BytesTo(v.chunkLength))
if !v.validator.Validate() {
buffer.Release()
return nil, errors.New("VMess|AuthChunkReader: Invalid auth.")
@@ -97,7 +97,7 @@ func (v *AuthChunkReader) Read() (*alloc.Buffer, error) {
leftLength := buffer.Len() - v.chunkLength
if leftLength > 0 {
v.last = alloc.NewBuffer().Clear()
v.last.Append(buffer.Value[v.chunkLength:])
v.last.Append(buffer.BytesFrom(v.chunkLength))
buffer.Slice(0, v.chunkLength)
}
+1 -1
View File
@@ -29,7 +29,7 @@ func (v *AuthChunkWriter) Release() {
func Authenticate(buffer *alloc.Buffer) {
fnvHash := fnv.New32a()
fnvHash.Write(buffer.Value)
fnvHash.Write(buffer.Bytes())
buffer.PrependHash(fnvHash)
buffer.PrependUint16(uint16(buffer.Len()))