X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=peer_info.go;h=e7b1b7c8053c1297403e4818e9c4b7b592f26789;hb=d27d1c809ef80cbfafdcffac6f4d18fb1d988a61;hp=fdd74c52b284e30ad6a9bd8074840dc84204339c;hpb=86063859850cf1288a2773fc7c7a0c646513d597;p=btrtrc.git diff --git a/peer_info.go b/peer_info.go index fdd74c52..e7b1b7c8 100644 --- a/peer_info.go +++ b/peer_info.go @@ -1,8 +1,6 @@ package torrent import ( - "net" - "github.com/anacrolix/dht/v2/krpc" "github.com/anacrolix/torrent/peer_protocol" @@ -11,7 +9,7 @@ import ( // Peer connection info, handed about publicly. type PeerInfo struct { Id [20]byte - Addr net.Addr + Addr PeerRemoteAddr Source PeerSource // Peer is known to support encryption. SupportsEncryption bool @@ -41,5 +39,6 @@ func (me *PeerInfo) FromPex(na krpc.NodeAddr, fs peer_protocol.PexPeerFlags) { } func (me PeerInfo) addr() IpPort { - return IpPort{IP: addrIpOrNil(me.Addr), Port: uint16(addrPortOrZero(me.Addr))} + ipPort, _ := tryIpPortFromNetAddr(me.Addr) + return IpPort{ipPort.IP, uint16(ipPort.Port)} }