xmengnet/mihomo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: Adjust error of dialer

Browse source
This commit is contained in:
gVisor bot 2022-11-19 10:57:33 +08:00
parent 6afa624bf3
commit a79d7c80cb
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
component/dialer/dialer.go
View file

@ -204,11 +204,17 @@ func dualStackDialContext(ctx context.Context, network, address string, opt *opt
} }
} }
case <-ctx.Done(): case <-ctx.Done():
err=ctx.Err()
break break
} }
} }
return nil, ctx.Err() if err==nil {
err=fmt.Errorf("dual stack dial failed")
}else{
err=fmt.Errorf("dual stack dial failed:%w",err)
}
return nil, err
} }
func concurrentDualStackDialContext(ctx context.Context, network, address string, opt *option) (net.Conn, error) { func concurrentDualStackDialContext(ctx context.Context, network, address string, opt *option) (net.Conn, error) {
@ -291,6 +297,7 @@ func concurrentDialContext(ctx context.Context, network string, ips []netip.Addr
connCount := len(ips) connCount := len(ips)
var fallback dialResult var fallback dialResult
var primaryError error var primaryError error
var finalError error
for i := 0; i < connCount; i++ { for i := 0; i < connCount; i++ {
select { select {
case res := <-results: case res := <-results:
@ -315,6 +322,7 @@ func concurrentDialContext(ctx context.Context, network string, ips []netip.Addr
if fallback.done && fallback.error == nil { if fallback.done && fallback.error == nil {
return fallback.Conn, nil return fallback.Conn, nil
} }
finalError=ctx.Err()
break break
} }
} }
@ -331,11 +339,13 @@ func concurrentDialContext(ctx context.Context, network string, ips []netip.Addr
return nil, fallback.error return nil, fallback.error
} }
if ctx.Err() != nil { if finalError==nil {
return nil, ctx.Err() finalError=fmt.Errorf("all ips %v tcp shake hands failed", ips)
}else{
finalError=fmt.Errorf("concurrent dial failed:%w",finalError)
} }
return nil, fmt.Errorf("all ips %v tcp shake hands failed", ips) return nil, finalError
} }
func singleDialContext(ctx context.Context, network string, address string, opt *option) (net.Conn, error) { func singleDialContext(ctx context.Context, network string, address string, opt *option) (net.Conn, error) {