From 3489a60154326d3ec272839a92a486e85dcbbd65 Mon Sep 17 00:00:00 2001
From: Matt Joiner <anacrolix@gmail.com>
Date: Sun, 16 Nov 2014 13:51:59 -0600
Subject: [PATCH] Fix broken commit
---
client.go | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/client.go b/client.go
index 1ba632ae..8c9e64df 100644
--- a/client.go
+++ b/client.go
@@ -383,10 +383,14 @@ func (me *Client) initiateConn(peer Peer, t *torrent) {
// "address in use" error. It seems it's not possible to dial out from
// this address so that peers associate our local address with our
// listen address.
+ var (
+ conn net.Conn
+ err error
+ )
if false {
- conn, err := net.DialTimeout("tcp", addr, dialTimeout)
+ conn, err = net.DialTimeout("tcp", addr, dialTimeout)
} else {
- conn, err := (&utp.Dialer{Timeout: dialTimeout}).Dial("utp", addr)
+ conn, err = (&utp.Dialer{Timeout: dialTimeout}).Dial("utp", addr)
}
// Whether or not the connection attempt succeeds, the half open
--
2.51.0