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

Merge pull request #884 from yujinqiu/fix-sniffer-typo 

Fix sniff typo
pull/1162/head
DarienRaymond 2018-02-26 10:56:39 +01:00 committed by GitHub
parent 58e79dbdc5 861ff94e5e
commit 0179b73de3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/dispatcher/default.go
View File

@ -55,12 +55,12 @@ func (d *DefaultDispatcher) Dispatch(ctx context.Context, destination net.Destin
ctx = proxy.ContextWithTarget(ctx, destination)
outbound := ray.NewRay(ctx)
sniferList := proxyman.ProtocoSniffersFromContext(ctx)
if destination.Address.Family().IsDomain() || len(sniferList) == 0 {
snifferList := proxyman.ProtocoSniffersFromContext(ctx)
if destination.Address.Family().IsDomain() || len(snifferList) == 0 {
go d.routedDispatch(ctx, outbound, destination)
} else {
go func() {
domain, err := snifer(ctx, sniferList, outbound)
domain, err := sniffer(ctx, snifferList, outbound)
if err == nil {
newError("sniffed domain: ", domain).WithContext(ctx).WriteToLog()
destination.Address = net.ParseAddress(domain)
@ -72,11 +72,11 @@ func (d *DefaultDispatcher) Dispatch(ctx context.Context, destination net.Destin
return outbound, nil
}
func snifer(ctx context.Context, sniferList []proxyman.KnownProtocols, outbound ray.OutboundRay) (string, error) {
func sniffer(ctx context.Context, snifferList []proxyman.KnownProtocols, outbound ray.OutboundRay) (string, error) {
payload := buf.New()
defer payload.Release()
sniffer := NewSniffer(sniferList)
sniffer := NewSniffer(snifferList)
totalAttempt := 0
for {
select {

4
app/dispatcher/sniffer.go
View File

@ -173,10 +173,10 @@ type Sniffer struct {
err []error
}
func NewSniffer(sniferList []proxyman.KnownProtocols) *Sniffer {
func NewSniffer(snifferList []proxyman.KnownProtocols) *Sniffer {
s := new(Sniffer)
for _, protocol := range sniferList {
for _, protocol := range snifferList {
var f func([]byte) (string, error)
switch protocol {
case proxyman.KnownProtocols_HTTP: