lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-06-26 09:25:23 +00:00
Code Issues Releases Wiki Activity

refactor peeking strategy

Browse Source
This commit is contained in:
Darien Raymond 2017-04-26 21:24:58 +02:00
parent 39005d8fc4
commit 93d913b959
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@ package impl
import (
"context"
"time"
"v2ray.com/core/app"
@ -81,6 +82,26 @@ func (d *DefaultDispatcher) Dispatch(ctx context.Context, destination net.Destin
return outbound, nil
}
func trySnif(sniferList []proxyman.KnownProtocols, b []byte) (string, error) {
for _, protocol := range sniferList {
var f func([]byte) (string, error)
switch protocol {
case proxyman.KnownProtocols_HTTP:
f = SniffHTTP
case proxyman.KnownProtocols_TLS:
f = SniffTLS
default:
panic("Unsupported protocol")
}
domain, err := f(b)
if err != ErrMoreData {
return domain, err
}
}
return "", ErrMoreData
}
func snifer(ctx context.Context, sniferList []proxyman.KnownProtocols, outbound ray.OutboundRay) (string, error) {
payload := buf.New()
defer payload.Release()
@ -90,27 +111,14 @@ func snifer(ctx context.Context, sniferList []proxyman.KnownProtocols, outbound
select {
case <-ctx.Done():
return "", ctx.Err()
case <-time.After(time.Millisecond * 100):
default:
totalAttempt++
if totalAttempt > 5 {
return "", errSniffingTimeout
}
outbound.OutboundInput().Peek(payload)
if payload.IsEmpty() {
continue
}
for _, protocol := range sniferList {
var f func([]byte) (string, error)
switch protocol {
case proxyman.KnownProtocols_HTTP:
f = SniffHTTP
case proxyman.KnownProtocols_TLS:
f = SniffTLS
default:
panic("Unsupported protocol")
}
domain, err := f(payload.Bytes())
if !payload.IsEmpty() {
domain, err := trySnif(sniferList, payload.Bytes())
if err != ErrMoreData {
return domain, err
}
@ -118,6 +126,7 @@ func snifer(ctx context.Context, sniferList []proxyman.KnownProtocols, outbound
if payload.IsFull() {
return "", ErrInvalidData
}
time.Sleep(time.Millisecond * 100)
}
}
}