]> Sergey Matveev's repositories - btrtrc.git/commitdiff
Use more generic net error type to detect timeouts
authorMatt Joiner <anacrolix@gmail.com>
Sun, 16 Nov 2014 19:31:11 +0000 (13:31 -0600)
committerMatt Joiner <anacrolix@gmail.com>
Sun, 16 Nov 2014 19:31:11 +0000 (13:31 -0600)
client.go

index 89a7bffb761ffdc25bda76580b3a05f9e0918976..1ba632aee9bdad46606e58a0b38d5197aefd05b3 100644 (file)
--- a/client.go
+++ b/client.go
@@ -401,10 +401,10 @@ func (me *Client) initiateConn(peer Peer, t *torrent) {
                        me.openNewConns()
                }()
 
+               if netErr, ok := err.(net.Error); ok && netErr.Timeout() {
+                       return
+               }
                if netOpErr, ok := err.(*net.OpError); ok {
-                       if netOpErr.Timeout() {
-                               return
-                       }
                        switch netOpErr.Err {
                        case syscall.ECONNREFUSED, syscall.EHOSTUNREACH:
                                return