github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

fix snifer

pull/182/merge v2.24.2
Darien Raymond 2017-04-25 01:56:08 +02:00
parent 00dd7d5cd2
commit 94405dd467
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/dispatcher/impl/default.go
View File

@ -110,7 +110,7 @@ func snifer(ctx context.Context, sniferList []proxyman.KnownProtocols, outbound
if mb.IsEmpty() { if mb.IsEmpty() {
continue continue
} }
nBytes, _ := mb.Read(payload) nBytes := mb.Copy(payload)
for _, protocol := range sniferList { for _, protocol := range sniferList {
var f func([]byte) (string, error) var f func([]byte) (string, error)
switch protocol { switch protocol {

12
common/buf/multi_buffer.go
View File

@ -31,6 +31,18 @@ func (mb *MultiBuffer) AppendMulti(buf MultiBuffer) {
*mb = append(*mb, buf...) *mb = append(*mb, buf...)
} }
func (mb MultiBuffer) Copy(b []byte) int {
total := 0
for _, bb := range mb {
nBytes := copy(b[total:], bb.Bytes())
total += nBytes
if nBytes < bb.Len() {
break
}
}
return total
}
func (mb *MultiBuffer) Read(b []byte) (int, error) { func (mb *MultiBuffer) Read(b []byte) (int, error) {
endIndex := len(*mb) endIndex := len(*mb)
totalBytes := 0 totalBytes := 0