Include PeerConn prefix for log messages

[btrtrc.git] / pex.go

diff --git a/pex.go b/pex.go
index 76d4cb42eb1eddba0321e9ea9963ac23e9103164..c5ed6099d3f046636e0f86f51abc7d3a3efa7929 100644 (file)
--- a/pex.go
+++ b/pex.go
@@ -3,9 +3,9 @@ package torrent
 import (
        "net"
        "sync"
-       "time"
 
        "github.com/anacrolix/dht/v2/krpc"
+
        pp "github.com/anacrolix/torrent/peer_protocol"
 )
 
@@ -144,8 +144,8 @@ func (me *pexMsgFactory) append(event pexEvent) {
        }
 }
 
-func (me *pexMsgFactory) PexMsg() pp.PexMsg {
-       return me.msg
+func (me *pexMsgFactory) PexMsg() *pp.PexMsg {
+       return &me.msg
 }
 
 // Convert an arbitrary torrent peer Addr into one that can be represented by the compact addr
@@ -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
@@ -169,7 +161,6 @@ type pexState struct {
        sync.RWMutex
        tail *pexEvent     // event feed list
        hold []pexEvent    // delayed drops
-       rest time.Time     // cooldown deadline on inbound
        nc   int           // net number of alive conns
        msg0 pexMsgFactory // initial message
 }
@@ -181,7 +172,6 @@ func (s *pexState) Reset() {
        s.tail = nil
        s.hold = nil
        s.nc = 0
-       s.rest = time.Time{}
        s.msg0 = pexMsgFactory{}
 }
 
@@ -232,7 +222,7 @@ func (s *pexState) Genmsg(start *pexEvent) (pp.PexMsg, *pexEvent) {
        s.RLock()
        defer s.RUnlock()
        if start == nil {
-               return s.msg0.PexMsg(), s.tail
+               return *s.msg0.PexMsg(), s.tail
        }
        var msg pexMsgFactory
        last := start
@@ -243,5 +233,18 @@ func (s *pexState) Genmsg(start *pexEvent) (pp.PexMsg, *pexEvent) {
                msg.append(*e)
                last = e
        }
-       return msg.PexMsg(), last
+       return *msg.PexMsg(), last
+}
+
+// The same as Genmsg but just counts up the distinct events that haven't been sent.
+func (s *pexState) numPending(start *pexEvent) (num int) {
+       s.RLock()
+       defer s.RUnlock()
+       if start == nil {
+               return s.msg0.PexMsg().Len()
+       }
+       for e := start.next; e != nil; e = e.next {
+               num++
+       }
+       return
 }