From 102f3182fc51e1328a971ae3fd10691c3f3e1335 Mon Sep 17 00:00:00 2001 From: Yaroslav Kolomiiets Date: Wed, 8 Dec 2021 13:02:36 +0000 Subject: [PATCH] PEX: remove workaround for krpc marshaller --- pex.go | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pex.go b/pex.go index 76d4cb42..f274ac15 100644 --- 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 -- 2.44.0