From: Matt Joiner <anacrolix@gmail.com>
Date: Tue, 2 Dec 2014 06:11:39 +0000 (-0600)
Subject: Backed out changeset: 603a76a6bdb0
X-Git-Tag: v1.0.0~1437
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=e7dec6057be0cbac8021e706404b0350815be244;p=btrtrc.git

Backed out changeset: 603a76a6bdb0
---

diff --git a/client.go b/client.go
index 6ac5a229..24af34da 100644
--- a/client.go
+++ b/client.go
@@ -426,15 +426,9 @@ func NewClient(cfg *Config) (cl *Client, err error) {
 		cl.listeners = append(cl.listeners, l)
 		go cl.acceptConnections(l, false)
 	}
-	var utpL *utp.Listener
+	var utpL *utp.UTPListener
 	if !cfg.DisableUTP {
-		var utpAddr *utp.Addr
-		utpAddr, err = utp.ResolveAddr("utp", listenAddr())
-		if err != nil {
-			err = fmt.Errorf("error resolving utp listen addr: %s", err)
-			return
-		}
-		utpL, err = utp.Listen("utp", utpAddr)
+		utpL, err = utp.Listen("utp", listenAddr())
 		if err != nil {
 			return
 		}
@@ -887,9 +881,10 @@ func (me *Client) runConnection(sock net.Conn, torrent *torrent, discovery peerS
 		})
 	}
 	if conn.PeerExtensionBytes[7]&0x01 != 0 && me.dHT != nil {
+		addr, _ := me.dHT.LocalAddr().(*net.UDPAddr)
 		conn.Post(pp.Message{
 			Type: pp.Port,
-			Port: uint16(AddrPort(me.dHT.LocalAddr())),
+			Port: uint16(addr.Port),
 		})
 	}
 	if torrent.haveInfo() {