Skip test failures due to Go uTP implementation

[btrtrc.git] / torrent.go

diff --git a/torrent.go b/torrent.go
index eeac172d10641dc997a566f4980abea44f2d555c..5184fc795971f6aa3987db55f51ce37ab439ab53 100644 (file)
--- a/torrent.go
+++ b/torrent.go
@@ -1071,7 +1071,7 @@ func (t *Torrent) maybeDropMutuallyCompletePeer(
        if p.useful() {
                return
        }
-       t.logger.WithDefaultLevel(log.Debug).Printf("dropping %v, which is mutually complete", p)
+       p.logger.Levelf(log.Debug, "is mutually complete; dropping")
        p.drop()
 }
 
@@ -2801,6 +2801,7 @@ func (t *Torrent) handleReceivedUtHolepunchMsg(msg utHolepunch.Msg, sender *Peer
                }
                return nil
        case utHolepunch.Connect:
+               t.logger.Printf("got holepunch connect request for %v from %p", msg.AddrPort, sender)
                opts := outgoingConnOpts{
                        peerInfo: PeerInfo{
                                Addr:         msg.AddrPort,
@@ -2825,7 +2826,7 @@ func (t *Torrent) handleReceivedUtHolepunchMsg(msg utHolepunch.Msg, sender *Peer
        }
 }
 
-func (t *Torrent) startHolepunchRendezvous(addrPort netip.AddrPort) error {
+func (t *Torrent) trySendHolepunchRendezvous(addrPort netip.AddrPort) error {
        rzsSent := 0
        for pc := range t.conns {
                if !pc.supportsExtension(utHolepunch.ExtensionName) {
@@ -2859,11 +2860,3 @@ func (t *Torrent) getDialTimeoutUnlocked() time.Duration {
        defer cl.rUnlock()
        return t.dialTimeout()
 }
-
-func (t *Torrent) startHolepunchRendezvousForPeerRemoteAddr(addr PeerRemoteAddr) error {
-       addrPort, err := addrPortFromPeerRemoteAddr(addr)
-       if err != nil {
-               return err
-       }
-       return t.startHolepunchRendezvous(addrPort)
-}