From: Yaroslav Kolomiiets <yarikos@gmail.com>
Date: Wed, 8 Dec 2021 13:02:36 +0000 (+0000)
Subject: PEX: remove workaround for krpc marshaller
X-Git-Tag: v1.39.0~23
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=102f3182fc51e1328a971ae3fd10691c3f3e1335;p=btrtrc.git

PEX: remove workaround for krpc marshaller
---

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