lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-02-20 23:47:21 -05:00
Code Issues Releases Wiki Activity

rename Slice and Slice from to Resize and Advance

Browse Source
This commit is contained in:
Darien Raymond 2018-04-19 23:48:38 +02:00
parent 1425fd2ba9
commit 3997d13b97
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
8 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/proxyman/mux/frame.go
View File

@ -98,7 +98,7 @@ func ReadFrameFrom(b *buf.Buffer) (*FrameMetadata, error) {
if f.SessionStatus == SessionStatusNew { if f.SessionStatus == SessionStatusNew {
network := TargetNetwork(b.Byte(4)) network := TargetNetwork(b.Byte(4))
b.SliceFrom(5) b.Advance(5)
addr, port, err := addrParser.ReadAddressPort(nil, b) addr, port, err := addrParser.ReadAddressPort(nil, b)
if err != nil { if err != nil {

8
common/buf/buffer.go
View File

@ -97,8 +97,8 @@ func (b *Buffer) BytesTo(to int32) []byte {
return b.v[b.start : b.start+to] return b.v[b.start : b.start+to]
} }
// Slice cuts the buffer at the given position. // Resize cuts the buffer at the given position.
func (b *Buffer) Slice(from, to int32) { func (b *Buffer) Resize(from, to int32) {
if from < 0 { if from < 0 {
from += b.Len() from += b.Len()
} }
@ -112,8 +112,8 @@ func (b *Buffer) Slice(from, to int32) {
b.start += from b.start += from
} }
// SliceFrom cuts the buffer at the given position. // Advance cuts the buffer at the given position.
func (b *Buffer) SliceFrom(from int32) { func (b *Buffer) Advance(from int32) {
if from < 0 { if from < 0 {
from += b.Len() from += b.Len()
} }

2
common/crypto/auth.go
View File

@ -145,7 +145,7 @@ func (r *AuthenticationReader) readInternal(soft bool) (*buf.Buffer, error) {
b.Release() b.Release()
return nil, err return nil, err
} }
b.Slice(0, int32(len(rb))) b.Resize(0, int32(len(rb)))
return b, nil return b, nil
} }

6
proxy/shadowsocks/config.go
View File

@ -146,7 +146,7 @@ func (v *AesCfb) DecodePacket(key []byte, b *buf.Buffer) error {
iv := b.BytesTo(v.IVSize()) iv := b.BytesTo(v.IVSize())
stream := crypto.NewAesDecryptionStream(key, iv) stream := crypto.NewAesDecryptionStream(key, iv)
stream.XORKeyStream(b.BytesFrom(v.IVSize()), b.BytesFrom(v.IVSize())) stream.XORKeyStream(b.BytesFrom(v.IVSize()), b.BytesFrom(v.IVSize()))
b.SliceFrom(v.IVSize()) b.Advance(v.IVSize())
return nil return nil
} }
@ -221,7 +221,7 @@ func (c *AEADCipher) DecodePacket(key []byte, b *buf.Buffer) error {
}); err != nil { }); err != nil {
return err return err
} }
b.SliceFrom(ivLen) b.Advance(ivLen)
return nil return nil
} }
@ -265,7 +265,7 @@ func (v *ChaCha20) DecodePacket(key []byte, b *buf.Buffer) error {
iv := b.BytesTo(v.IVSize()) iv := b.BytesTo(v.IVSize())
stream := crypto.NewChaCha20Stream(key, iv) stream := crypto.NewChaCha20Stream(key, iv)
stream.XORKeyStream(b.BytesFrom(v.IVSize()), b.BytesFrom(v.IVSize())) stream.XORKeyStream(b.BytesFrom(v.IVSize()), b.BytesFrom(v.IVSize()))
b.SliceFrom(v.IVSize()) b.Advance(v.IVSize())
return nil return nil
} }

2
proxy/shadowsocks/ota.go
View File

@ -91,7 +91,7 @@ func (v *ChunkReader) ReadMultiBuffer() (buf.MultiBuffer, error) {
buffer.Release() buffer.Release()
return nil, newError("invalid auth") return nil, newError("invalid auth")
} }
buffer.SliceFrom(AuthSize) buffer.Advance(AuthSize)
return buf.NewMultiBufferValue(buffer), nil return buf.NewMultiBufferValue(buffer), nil
} }

2
proxy/shadowsocks/protocol.go
View File

@ -295,7 +295,7 @@ func DecodeUDPPacket(user *protocol.User, payload *buf.Buffer) (*protocol.Reques
return nil, nil, newError("invalid OTA") return nil, nil, newError("invalid OTA")
} }
payload.Slice(0, payloadLen) payload.Resize(0, payloadLen)
} }
} }

2
proxy/socks/protocol.go
View File

@ -274,7 +274,7 @@ func DecodeUDPPacket(packet *buf.Buffer) (*protocol.RequestHeader, error) {
return nil, newError("discarding fragmented payload.") return nil, newError("discarding fragmented payload.")
} }
packet.SliceFrom(3) packet.Advance(3)
addr, port, err := addrParser.ReadAddressPort(nil, packet) addr, port, err := addrParser.ReadAddressPort(nil, packet)
if err != nil { if err != nil {

2
transport/internet/headers/http/http.go
View File

@ -66,7 +66,7 @@ func (*HeaderReader) Read(reader io.Reader) (*buf.Buffer, error) {
return nil, err return nil, err
} }
if n := bytes.Index(buffer.Bytes(), []byte(ENDING)); n != -1 { if n := bytes.Index(buffer.Bytes(), []byte(ENDING)); n != -1 {
buffer.SliceFrom(int32(n + len(ENDING))) buffer.Advance(int32(n + len(ENDING)))
endingDetected = true endingDetected = true
break break
} }