Add util AddrIP and AddrPort functions

[btrtrc.git] / dht / dht.go

diff --git a/dht/dht.go b/dht/dht.go
index 9118df71ca967c84c6faf3d20968660abfb35a6d..5f671e606367cc3a415754ac38d31feead2635c3 100644 (file)
--- a/dht/dht.go
+++ b/dht/dht.go
@@ -487,14 +487,14 @@ func (ni *NodeInfo) PutCompact(b []byte) error {
        if n := copy(b[:], ni.ID[:]); n != 20 {
                panic(n)
        }
-       ip := ni.Addr.IP.To4()
+       ip := util.AddrIP(ni.Addr).To4()
        if len(ip) != 4 {
                panic(ip)
        }
        if n := copy(b[20:], ip); n != 4 {
                panic(n)
        }
-       binary.BigEndian.PutUint16(b[24:], uint16(ni.Addr.Port))
+       binary.BigEndian.PutUint16(b[24:], uint16(util.AddrPort(ni.Addr)))
        return nil
 }
 
@@ -651,7 +651,7 @@ func (s *Server) liftNodes(d Msg) {
                // log.Print(err)
        } else {
                for _, cni := range r.Nodes {
-                       if cni.Addr.Port == 0 {
+                       if util.AddrPort(cni.Addr) == 0 {
                                // TODO: Why would people even do this?
                                continue
                        }