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,36 +108,19 @@ func dial(dialer net.Dialer, netw, addr string) (c net.Conn, err error) {
} }
} }
// try to connect in a loop for EADDRINUSE errors. if fd, err = socket(rfamily, socktype, rprotocol); err != nil {
start := time.Now() return nil, err
for { }
if fd, err = socket(rfamily, socktype, rprotocol); err != nil { if err = syscall.Bind(fd, localSockaddr); err != nil {
return nil, err // fmt.Println("bind failed")
} syscall.Close(fd)
return nil, err
if err = syscall.Bind(fd, localSockaddr); err != nil { }
// fmt.Println("bind failed") if err = connect(fd, remoteSockaddr); err != nil {
syscall.Close(fd) syscall.Close(fd)
return nil, err // fmt.Println("connect failed", localSockaddr, err)
} return nil, err
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 { if rprotocol == syscall.IPPROTO_TCP {