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

Fix: TCP dial error should not return early (#307)

Browse source
This commit is contained in:
gVisor bot 2019-09-17 20:11:49 +08:00
parent b38663a209
commit 5b76ff53c9
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
adapters/outbound/util.go
View file

@ -140,12 +140,9 @@ func dialTimeout(network, address string, timeout time.Duration) (net.Conn, erro
} else { } else {
c, err = dialer.DialContext(ctx, "tcp4", net.JoinHostPort(ip.String(), port)) c, err = dialer.DialContext(ctx, "tcp4", net.JoinHostPort(ip.String(), port))
} }
if err != nil {
return
}
select { select {
case results <- dialResult{Conn: c, error: err, ipv6: ipv6}: case results <- dialResult{Conn: c, error: err, ipv6: ipv6, done: true}:
case <-returned: case <-returned:
if c != nil { if c != nil {
c.Close() c.Close()