disregard eaddrinuse

This commit is contained in:
Juan Batiz-Benet
2015-01-19 02:47:47 -08:00
parent 8437d27d99
commit ce9cd56d19

View File

@@ -108,10 +108,6 @@ func dial(dialer net.Dialer, netw, addr string) (c net.Conn, err error) {
}
}
// try to connect in a loop for EADDRINUSE errors.
start := time.Now()
for {
if fd, err = socket(rfamily, socktype, rprotocol); err != nil {
return nil, err
}
@@ -123,23 +119,10 @@ func dial(dialer net.Dialer, netw, addr string) (c net.Conn, err error) {
}
if err = connect(fd, remoteSockaddr); err != nil {
syscall.Close(fd)
if err == syscall.EADDRINUSE {
// if we've waited longer than 2 seconds bail.
if time.Now().Sub(start) > 2*time.Second {
return nil, err
}
// otherwise, wait a bit and try again
<-time.After(20 * time.Microsecond)
continue
}
// fmt.Println("connect failed", localSockaddr, err)
return nil, err
}
break
}
if rprotocol == syscall.IPPROTO_TCP {
// by default golang/net sets TCP no delay to true.
if err = setNoDelay(fd, true); err != nil {