Add holepunching stats and tests

[btrtrc.git] / peerconn.go

diff --git a/peerconn.go b/peerconn.go
index 4fefd6101b954c0a0347108e914653425c1b234b..1443a7b9a7afaf7fe86c4f8ea9247b367c8cd0a9 100644 (file)
--- a/peerconn.go
+++ b/peerconn.go
@@ -15,10 +15,12 @@ import (
        "time"
 
        "github.com/RoaringBitmap/roaring"
+       "github.com/anacrolix/generics"
        . "github.com/anacrolix/generics"
        "github.com/anacrolix/log"
        "github.com/anacrolix/missinggo/v2/bitmap"
        "github.com/anacrolix/multiless"
+       "golang.org/x/exp/maps"
        "golang.org/x/time/rate"
 
        "github.com/anacrolix/torrent/bencode"
@@ -40,6 +42,7 @@ type PeerConn struct {
        // See BEP 3 etc.
        PeerID             PeerID
        PeerExtensionBytes pp.PeerExtensionBits
+       PeerListenPort     int
 
        // The actual Conn, used for closing, and setting socket options. Do not use methods on this
        // while holding any mutexes.
@@ -66,7 +69,7 @@ type PeerConn struct {
 }
 
 func (cn *PeerConn) pexStatus() string {
-       if !cn.bitExtensionEnabled(pp.ExtensionBitExtended) {
+       if !cn.bitExtensionEnabled(pp.ExtensionBitLtep) {
                return "extended protocol disabled"
        }
        if cn.PeerExtensionIDs == nil {
@@ -75,11 +78,25 @@ func (cn *PeerConn) pexStatus() string {
        if !cn.supportsExtension(pp.ExtensionNamePex) {
                return "unsupported"
        }
-       return fmt.Sprintf(
-               "%v conns, %v unsent events",
-               len(cn.pex.remoteLiveConns),
-               cn.pex.numPending(),
-       )
+       if true {
+               return fmt.Sprintf(
+                       "%v conns, %v unsent events",
+                       len(cn.pex.remoteLiveConns),
+                       cn.pex.numPending(),
+               )
+       } else {
+               // This alternative branch prints out the remote live conn addresses.
+               return fmt.Sprintf(
+                       "%v conns, %v unsent events",
+                       strings.Join(generics.SliceMap(
+                               maps.Keys(cn.pex.remoteLiveConns),
+                               func(from netip.AddrPort) string {
+                                       return from.String()
+                               }), ","),
+                       cn.pex.numPending(),
+               )
+
+       }
 }
 
 func (cn *PeerConn) peerImplStatusLines() []string {
@@ -100,10 +117,12 @@ func (cn *PeerConn) ipv6() bool {
        return len(ip) == net.IPv6len
 }
 
-// Returns true the if the dialer/initiator has the lower client peer ID. TODO: Find the
-// specification for this.
+// Returns true the if the dialer/initiator has the higher client peer ID. See
+// https://github.com/arvidn/libtorrent/blame/272828e1cc37b042dfbbafa539222d8533e99755/src/bt_peer_connection.cpp#L3536-L3557.
+// As far as I can tell, Transmission just keeps the oldest connection.
 func (cn *PeerConn) isPreferredDirection() bool {
-       return bytes.Compare(cn.t.cl.peerID[:], cn.PeerID[:]) < 0 == cn.outgoing
+       // True if our client peer ID is higher than the remote's peer ID.
+       return bytes.Compare(cn.PeerID[:], cn.t.cl.peerID[:]) < 0 == cn.outgoing
 }
 
 // Returns whether the left connection should be preferred over the right one,
@@ -1047,6 +1066,8 @@ func (c *PeerConn) dialAddr() PeerRemoteAddr {
                        dialAddr := *addr
                        dialAddr.Port = c.PeerListenPort
                        return &dialAddr
+               default:
+                       panic(addr)
                }
        }
        return c.RemoteAddr
@@ -1080,6 +1101,11 @@ func (pc *PeerConn) remoteAddrPort() Option[netip.AddrPort] {
        }).AddrPort())
 }
 
+func (pc *PeerConn) remoteDialAddrPort() (netip.AddrPort, error) {
+       dialAddr := pc.dialAddr()
+       return addrPortFromPeerRemoteAddr(dialAddr)
+}
+
 func (pc *PeerConn) bitExtensionEnabled(bit pp.ExtensionBit) bool {
        return pc.t.cl.config.Extensions.GetBit(bit) && pc.PeerExtensionBytes.GetBit(bit)
 }