dlss
/
FedP2P
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Count peers obtained by tracker

This commit is contained in:
Matt Joiner 2015-03-12 20:04:44 +11:00
parent 954e03952a
commit 339c650085
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
client.go
View File

@ -42,6 +42,7 @@ import (
"bitbucket.org/anacrolix/go.torrent/dht" "bitbucket.org/anacrolix/go.torrent/dht"
"bitbucket.org/anacrolix/go.torrent/internal/pieceordering" "bitbucket.org/anacrolix/go.torrent/internal/pieceordering"
"bitbucket.org/anacrolix/go.torrent/iplist" "bitbucket.org/anacrolix/go.torrent/iplist"
"bitbucket.org/anacrolix/go.torrent/logonce"
pp "bitbucket.org/anacrolix/go.torrent/peer_protocol" pp "bitbucket.org/anacrolix/go.torrent/peer_protocol"
"bitbucket.org/anacrolix/go.torrent/tracker" "bitbucket.org/anacrolix/go.torrent/tracker"
_ "bitbucket.org/anacrolix/go.torrent/tracker/udp" _ "bitbucket.org/anacrolix/go.torrent/tracker/udp"
@ -57,6 +58,7 @@ var (
chunksDownloadedCount = expvar.NewInt("chunksDownloadedCount") chunksDownloadedCount = expvar.NewInt("chunksDownloadedCount")
peersFoundByDHT = expvar.NewInt("peersFoundByDHT") peersFoundByDHT = expvar.NewInt("peersFoundByDHT")
peersFoundByPEX = expvar.NewInt("peersFoundByPEX") peersFoundByPEX = expvar.NewInt("peersFoundByPEX")
peersFoundByTracker = expvar.NewInt("peersFoundByTracker")
uploadChunksPosted = expvar.NewInt("uploadChunksPosted") uploadChunksPosted = expvar.NewInt("uploadChunksPosted")
unexpectedCancels = expvar.NewInt("unexpectedCancels") unexpectedCancels = expvar.NewInt("unexpectedCancels")
postedCancels = expvar.NewInt("postedCancels") postedCancels = expvar.NewInt("postedCancels")
@ -606,7 +608,7 @@ func (cl *Client) acceptConnections(l net.Listener, utp bool) {
cl.mu.RUnlock() cl.mu.RUnlock()
if blockRange != nil { if blockRange != nil {
inboundConnsBlocked.Add(1) inboundConnsBlocked.Add(1)
log.Printf("inbound connection from %s blocked by %s", conn.RemoteAddr(), blockRange) // log.Printf("inbound connection from %s blocked by %s", conn.RemoteAddr(), blockRange)
conn.Close() conn.Close()
continue continue
} }
@ -784,8 +786,10 @@ func handshakeWriter(w io.WriteCloser, bb <-chan []byte, done chan<- error) {
done <- err done <- err
} }
type peerExtensionBytes [8]byte type (
type peerID [20]byte peerExtensionBytes [8]byte
peerID [20]byte
)
type handshakeResult struct { type handshakeResult struct {
peerExtensionBytes peerExtensionBytes
@ -2149,7 +2153,9 @@ func (cl *Client) announceTorrentSingleTracker(tr tracker.Client, req *tracker.A
cl.mu.Lock() cl.mu.Lock()
cl.addPeers(t, peers) cl.addPeers(t, peers)
cl.mu.Unlock() cl.mu.Unlock()
log.Printf("%s: %d new peers from %s", t, len(peers), tr) log.Printf("%s: %d new peers from %s", t, len(peers), tr)
peersFoundByTracker.Add(int64(len(peers)))
time.Sleep(time.Second * time.Duration(resp.Interval)) time.Sleep(time.Second * time.Duration(resp.Interval))
return nil return nil
@ -2208,7 +2214,7 @@ newAnnounce:
numTrackersTried++ numTrackersTried++
err := cl.announceTorrentSingleTracker(tr, &req, t) err := cl.announceTorrentSingleTracker(tr, &req, t)
if err != nil { if err != nil {
continue logonce.Stderr.Printf("%s: error announcing to %s: %s", t, tr, err)
} }
// Float the successful announce to the top of the tier. If // Float the successful announce to the top of the tier. If
// the trackers list has been changed, we'll be modifying an // the trackers list has been changed, we'll be modifying an