import (
"net"
+ "net/netip"
"sync"
"time"
- "github.com/anacrolix/dht/v2/krpc"
pp "github.com/anacrolix/torrent/peer_protocol"
)
// represents a single connection (t=pexAdd) or disconnection (t=pexDrop) event
type pexEvent struct {
t pexEventType
- addr PeerRemoteAddr
+ addr netip.AddrPort
f pp.PexPeerFlags
next *pexEvent // event feed list
}
// facilitates efficient de-duplication while generating PEX messages
type pexMsgFactory struct {
msg pp.PexMsg
- added map[addrKey]struct{}
- dropped map[addrKey]struct{}
+ added map[netip.AddrPort]struct{}
+ dropped map[netip.AddrPort]struct{}
}
func (me *pexMsgFactory) DeltaLen() int {
int64(len(me.dropped))))
}
-type addrKey string
+type addrKey = netip.AddrPort
// Returns the key to use to identify a given addr in the factory.
-func (me *pexMsgFactory) addrKey(addr PeerRemoteAddr) addrKey {
- return addrKey(addr.String())
-}
-
-func addrEqual(a, b *krpc.NodeAddr) bool {
- return a.IP.Equal(b.IP) && a.Port == b.Port
-}
-
-func addrIndex(v []krpc.NodeAddr, a *krpc.NodeAddr) int {
- for i := 0; i < len(v); i += 1 {
- if addrEqual(&v[i], a) {
- return i
- }
- }
- return -1
+func (me *pexMsgFactory) addrKey(addr netip.AddrPort) addrKey {
+ return addr
}
// Returns whether the entry was added (we can check if we're cancelling out another entry and so
if me.added == nil {
me.added = make(map[addrKey]struct{}, pexMaxDelta)
}
- addr, ok := nodeAddr(e.addr)
- if !ok {
- return
- }
+ addr := krpcNodeAddrFromAddrPort(e.addr)
m := &me.msg
switch {
case addr.IP.To4() != nil:
if _, ok := me.dropped[key]; ok {
- if i := addrIndex(m.Dropped.NodeAddrs(), &addr); i >= 0 {
+ if i := m.Dropped.Index(addr); i >= 0 {
m.Dropped = append(m.Dropped[:i], m.Dropped[i+1:]...)
}
delete(me.dropped, key)
m.AddedFlags = append(m.AddedFlags, e.f)
case len(addr.IP) == net.IPv6len:
if _, ok := me.dropped[key]; ok {
- if i := addrIndex(m.Dropped6.NodeAddrs(), &addr); i >= 0 {
+ if i := m.Dropped6.Index(addr); i >= 0 {
m.Dropped6 = append(m.Dropped6[:i], m.Dropped6[i+1:]...)
}
delete(me.dropped, key)
// Returns whether the entry was added (we can check if we're cancelling out another entry and so
// won't hit the limit consuming this event).
func (me *pexMsgFactory) drop(e pexEvent) {
- addr, ok := nodeAddr(e.addr)
- if !ok {
- return
- }
+ addr := krpcNodeAddrFromAddrPort(e.addr)
key := me.addrKey(e.addr)
if me.dropped == nil {
me.dropped = make(map[addrKey]struct{}, pexMaxDelta)
switch {
case addr.IP.To4() != nil:
if _, ok := me.added[key]; ok {
- if i := addrIndex(m.Added.NodeAddrs(), &addr); i >= 0 {
+ if i := m.Added.Index(addr); i >= 0 {
m.Added = append(m.Added[:i], m.Added[i+1:]...)
m.AddedFlags = append(m.AddedFlags[:i], m.AddedFlags[i+1:]...)
}
m.Dropped = append(m.Dropped, addr)
case len(addr.IP) == net.IPv6len:
if _, ok := me.added[key]; ok {
- if i := addrIndex(m.Added6.NodeAddrs(), &addr); i >= 0 {
+ if i := m.Added6.Index(addr); i >= 0 {
m.Added6 = append(m.Added6[:i], m.Added6[i+1:]...)
m.Added6Flags = append(m.Added6Flags[:i], m.Added6Flags[i+1:]...)
}
}
}
-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
-// format.
-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
+func (me *pexMsgFactory) PexMsg() *pp.PexMsg {
+ return &me.msg
}
// Per-torrent PEX state
type pexState struct {
sync.RWMutex
- tail *pexEvent // event feed list
- hold []pexEvent // delayed drops
- rest time.Time // cooldown deadline on inbound
+ tail *pexEvent // event feed list
+ hold []pexEvent // delayed drops
+ // Torrent-wide cooldown deadline on inbound. This exists to prevent PEX from drowning out other
+ // peer address sources, until that is fixed.
+ rest time.Time
nc int // net number of alive conns
msg0 pexMsgFactory // initial message
}
}
func (s *pexState) Add(c *PeerConn) {
+ e, err := c.pexEvent(pexAdd)
+ if err != nil {
+ return
+ }
s.Lock()
defer s.Unlock()
s.nc++
}
s.hold = s.hold[:0]
}
- e := c.pexEvent(pexAdd)
c.pex.Listed = true
s.append(&e)
}
// skip connections which were not previously Added
return
}
+ e, err := c.pexEvent(pexDrop)
+ if err != nil {
+ return
+ }
s.Lock()
defer s.Unlock()
- e := c.pexEvent(pexDrop)
s.nc--
if s.nc < pexTargAdded && len(s.hold) < pexMaxHold {
s.hold = append(s.hold, e)
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
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
}