1
0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-02-05 07:45:23 -05:00

fixmultiplesniffer

This commit is contained in:
Darien Raymond
2017-06-05 23:27:50 +02:00
parent 72736b0447
commit 8a3288dc6c
2 changed files with 49 additions and 21 deletions

View File

@@ -88,30 +88,11 @@ 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()
sniffer := NewSniffer(sniferList)
totalAttempt := 0
for {
select {
@@ -124,7 +105,7 @@ func snifer(ctx context.Context, sniferList []proxyman.KnownProtocols, outbound
}
outbound.OutboundInput().Peek(payload)
if !payload.IsEmpty() {
domain, err := trySnif(sniferList, payload.Bytes())
domain, err := sniffer.Sniff(payload.Bytes())
if err != ErrMoreData {
return domain, err
}