From 40150314208d991d2baf9a82977ee2a3ebdd6def Mon Sep 17 00:00:00 2001 From: Matt Joiner Date: Fri, 18 Dec 2015 00:50:22 +1100 Subject: [PATCH] dht: announce_peer should not occur to insecure nodes Additionally, we now announce even if a token wasn't provided. Why not. --- dht/announce.go | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/dht/announce.go b/dht/announce.go index a41dbf9d..b416df9f 100644 --- a/dht/announce.go +++ b/dht/announce.go @@ -8,8 +8,9 @@ import ( "github.com/anacrolix/missinggo" "github.com/anacrolix/sync" - "github.com/anacrolix/torrent/logonce" "github.com/willf/bloom" + + "github.com/anacrolix/torrent/logonce" ) // Maintains state for an ongoing Announce operation. An Announce is started @@ -141,8 +142,18 @@ func (me *Announce) closingCh() chan struct{} { return me.stop } -func (me *Announce) announcePeer(to dHTAddr, token string) { +// Announce to a peer, if appropriate. +func (me *Announce) maybeAnnouncePeer(to dHTAddr, token, peerId string) { me.server.mu.Lock() + defer me.server.mu.Unlock() + if !me.server.config.NoSecurity { + if len(peerId) != 20 { + return + } + if !NodeIdSecure(peerId, to.IP()) { + return + } + } err := me.server.announcePeer(to, me.infoHash, me.announcePort, token, me.announcePortImplied) me.server.mu.Unlock() if err != nil { @@ -185,9 +196,7 @@ func (me *Announce) getPeers(addr dHTAddr) error { } } - if at := m.R.Token; at != "" { - me.announcePeer(addr, at) - } + me.maybeAnnouncePeer(addr, m.R.Token, m.SenderID()) } me.mu.Lock()