Use missinggo.AddrPort directly

diff --git a/client.go b/client.go
index 673f6e5da6b017f4b12bb266e5fc7bbdde8b5b2a..885b204e1ec851db883da423fb4bb9f60d065f78 100644 (file)
--- a/client.go
+++ b/client.go
@@ -234,7 +234,7 @@ func (cl *Client) WriteStatus(_w io.Writer) {
                dhtStats := cl.dHT.Stats()
                fmt.Fprintf(w, "DHT nodes: %d (%d good, %d banned)\n", dhtStats.Nodes, dhtStats.GoodNodes, dhtStats.BadNodes)
                fmt.Fprintf(w, "DHT Server ID: %x\n", cl.dHT.ID())
-               fmt.Fprintf(w, "DHT port: %d\n", addrPort(cl.dHT.Addr()))
+               fmt.Fprintf(w, "DHT port: %d\n", missinggo.AddrPort(cl.dHT.Addr()))
                fmt.Fprintf(w, "DHT announces: %d\n", dhtStats.ConfirmedAnnounces)
                fmt.Fprintf(w, "Outstanding transactions: %d\n", dhtStats.OutstandingTransactions)
        }
@@ -801,7 +801,7 @@ func (cl *Client) incomingPeerPort() int {
        if listenAddr == nil {
                return 0
        }
-       return addrPort(listenAddr)
+       return missinggo.AddrPort(listenAddr)
 }
 
 // Convert a net.Addr to its compact IP representation. Either 4 or 16 bytes
@@ -1267,11 +1267,6 @@ func (cl *Client) gotMetadataExtensionMsg(payload []byte, t *torrent, c *connect
        return
 }
 
-// Extracts the port as an integer from an address string.
-func addrPort(addr net.Addr) int {
-       return AddrPort(addr)
-}
-
 func (cl *Client) peerHasAll(t *torrent, cn *connection) {
        cn.peerHasAll = true
        cn.PeerPieces = nil