status-im/torrent
2
0
Fork 0
mirror of synced 2025-02-24 06:38:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restart DHT announces at regular intervals

Browse Source 
The existing implementation would crawl the DHT until the address bloom filter was full. This could take ages unless enough peers were found to fill the pending nodes for the torrent to the high water mark. Fixes #301.
This commit is contained in:
Matt Joiner 2019-01-21 03:46:26 +01:00
parent 25cd79aa1c
commit 69c39f0036
1 changed files with 24 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
torrent.go
View File

@ -8,7 +8,6 @@ import (
"io"
"math"
"math/rand"
"net"
"net/url"
"os"
"sync"
@ -1319,55 +1318,38 @@ func (t *Torrent) announceRequest() tracker.AnnounceRequest {
// Adds peers revealed in an announce until the announce ends, or we have
// enough peers.
func (t *Torrent) consumeDHTAnnounce(pvs <-chan dht.PeersValues) {
func (t *Torrent) consumeDhtAnnouncePeers(pvs <-chan dht.PeersValues) {
cl := t.cl
// Count all the unique addresses we got during this announce.
allAddrs := make(map[string]struct{})
for {
select {
case v, ok := <-pvs:
if !ok {
return
}
addPeers := make([]Peer, 0, len(v.Peers))
for v := range pvs {
cl.lock()
for _, cp := range v.Peers {
if cp.Port == 0 {
// Can't do anything with this.
continue
}
addPeers = append(addPeers, Peer{
t.addPeer(Peer{
IP: cp.IP[:],
Port: cp.Port,
Source: peerSourceDHTGetPeers,
})
key := (&net.UDPAddr{
IP: cp.IP[:],
Port: cp.Port,
}).String()
allAddrs[key] = struct{}{}
}
cl.lock()
t.addPeers(addPeers)
numPeers := t.peers.Len()
cl.unlock()
if numPeers >= cl.config.TorrentPeersHighWater {
return
}
case <-t.closed.LockedChan(cl.locker()):
return
}
}
}
func (t *Torrent) announceDHT(impliedPort bool, s *dht.Server) (err error) {
cl := t.cl
ps, err := s.Announce(t.infoHash, cl.incomingPeerPort(), impliedPort)
func (t *Torrent) announceToDht(impliedPort bool, s *dht.Server) error {
ps, err := s.Announce(t.infoHash, t.cl.incomingPeerPort(), impliedPort)
if err != nil {
return
return err
}
go t.consumeDhtAnnouncePeers(ps.Peers)
select {
case <-t.closed.LockedChan(t.cl.locker()):
case <-time.After(5 * time.Minute):
case <-t.wantPeersEvent.LockedChan(t.cl.locker()):
}
t.consumeDHTAnnounce(ps.Peers)
ps.Close()
return
return nil
}
func (t *Torrent) dhtAnnouncer(s *dht.Server) {
@ -1378,7 +1360,7 @@ func (t *Torrent) dhtAnnouncer(s *dht.Server) {
case <-t.closed.LockedChan(cl.locker()):
return
}
err := t.announceDHT(true, s)
err := t.announceToDht(true, s)
func() {
cl.lock()
defer cl.unlock()
@ -1388,11 +1370,6 @@ func (t *Torrent) dhtAnnouncer(s *dht.Server) {
t.logger.Printf("error announcing %q to DHT: %s", t, err)
}
}()
select {
case <-t.closed.LockedChan(cl.locker()):
return
case <-time.After(5 * time.Minute):
}
}
}