]> Sergey Matveev's repositories - btrtrc.git/commitdiff
PEX: remove workaround for krpc marshaller
authorYaroslav Kolomiiets <yarikos@gmail.com>
Wed, 8 Dec 2021 13:02:36 +0000 (13:02 +0000)
committerYaroslav Kolomiiets <yarikos@gmail.com>
Sat, 11 Dec 2021 19:44:42 +0000 (19:44 +0000)
pex.go

diff --git a/pex.go b/pex.go
index 76d4cb42eb1eddba0321e9ea9963ac23e9103164..f274ac1547432f7fc0bfa25bbc036218e16dd427 100644 (file)
--- a/pex.go
+++ b/pex.go
@@ -153,15 +153,7 @@ func (me *pexMsgFactory) PexMsg() pp.PexMsg {
 func nodeAddr(addr PeerRemoteAddr) (krpc.NodeAddr, bool) {
        ipport, _ := tryIpPortFromNetAddr(addr)
        ok := ipport.IP != nil
-       return krpc.NodeAddr{IP: shortestIP(ipport.IP), Port: ipport.Port}, ok
-}
-
-// mainly for the krpc marshallers
-func shortestIP(ip net.IP) net.IP {
-       if ip4 := ip.To4(); ip4 != nil {
-               return ip4
-       }
-       return ip
+       return krpc.NodeAddr{IP: ipport.IP, Port: ipport.Port}, ok
 }
 
 // Per-torrent PEX state