From: Matt Joiner <anacrolix@gmail.com>
Date: Sun, 16 Nov 2014 19:31:11 +0000 (-0600)
Subject: Use more generic net error type to detect timeouts
X-Git-Tag: v1.0.0~1541
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=4fead22cd272f24bc6d56ab6a1740838f2ed4409;p=btrtrc.git

Use more generic net error type to detect timeouts
---

diff --git a/client.go b/client.go
index 89a7bffb..1ba632ae 100644
--- 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