qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-12 07:00:21 -07:00
Code Releases Activity

net: don't return a nested error when happy eyeballs dialing

Browse Source 
Also removes an unused variable.

Fixes #6795.

R=adg, dave, bradfitz, gobot
CC=golang-dev
https://golang.org/cl/29440043
This commit is contained in:
Mikio Hara 2013-12-19 10:00:15 +09:00
parent b682f6de5a
commit 7eb45d3c4a
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pkg/net/dial.go
View File

@ -172,7 +172,6 @@ func (d *Dialer) Dial(network, address string) (Conn, error) {
func dialMulti(net, addr string, la Addr, ras addrList, deadline time.Time) (Conn, error) {
type racer struct {
Conn
Addr
error
}
// Sig controls the flow of dial results on lane. It passes a
@ -184,7 +183,7 @@ func dialMulti(net, addr string, la Addr, ras addrList, deadline time.Time) (Con
go func(ra Addr) {
c, err := dialSingle(net, addr, la, ra, deadline)
if _, ok := <-sig; ok {
lane <- racer{c, ra, err}
lane <- racer{c, err}
} else if err == nil {
// We have to return the resources
// that belong to the other
@ -195,7 +194,6 @@ func dialMulti(net, addr string, la Addr, ras addrList, deadline time.Time) (Con
}(ra.toAddr())
}
defer close(sig)
var failAddr Addr
lastErr := errTimeout
nracers := len(ras)
for nracers > 0 {
@ -205,12 +203,11 @@ func dialMulti(net, addr string, la Addr, ras addrList, deadline time.Time) (Con
if racer.error == nil {
return racer.Conn, nil
}
failAddr = racer.Addr
lastErr = racer.error
nracers--
}
}
return nil, &OpError{Op: "dial", Net: net, Addr: failAddr, Err: lastErr}
return nil, lastErr
}
// dialSingle attempts to establish and returns a single connection to