LBRYCommunity/tracker
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #242 from jzelinskie/fixcomplete

Browse source 
middleware: fix scrape data in announces
This commit is contained in:
Jimmy Zelinskie 2016-10-03 14:46:42 -04:00 • committed by GitHub
commit 404e7f5821
1 changed files with 25 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
middleware/hooks.go
View file

@ -96,36 +96,43 @@ func (h *responseHook) HandleAnnounce(ctx context.Context, req *bittorrent.Annou
return ctx, nil return ctx, nil
} }
// Add the Scrape data to the response.
s := h.store.ScrapeSwarm(req.InfoHash, len(req.IP) == net.IPv6len) s := h.store.ScrapeSwarm(req.InfoHash, len(req.IP) == net.IPv6len)
resp.Incomplete = s.Incomplete resp.Incomplete = s.Incomplete
resp.Complete = s.Complete resp.Complete = s.Complete
switch len(req.IP) { err = h.appendPeers(req, resp)
case net.IPv4len:
resp.IPv4Peers, err = h.getPeers(req.InfoHash, req.Left == 0, int(req.NumWant), req.Peer)
case net.IPv6len:
resp.IPv6Peers, err = h.getPeers(req.InfoHash, req.Left == 0, int(req.NumWant), req.Peer)
default:
return ctx, ErrInvalidIP
}
return ctx, err return ctx, err
} }
func (h *responseHook) getPeers(ih bittorrent.InfoHash, seeder bool, numWant int, p bittorrent.Peer) ([]bittorrent.Peer, error) { func (h *responseHook) appendPeers(req *bittorrent.AnnounceRequest, resp *bittorrent.AnnounceResponse) error {
peers, err := h.store.AnnouncePeers(ih, seeder, numWant, p) seeding := req.Left == 0
peers, err := h.store.AnnouncePeers(req.InfoHash, seeding, int(req.NumWant), req.Peer)
if err != nil && err != storage.ErrResourceDoesNotExist { if err != nil && err != storage.ErrResourceDoesNotExist {
return nil, err return err
} }
// Insert announcing peer. // Some clients expect a minimum of their own peer representation returned to
// Some clients expect at least themselves in every announce response. // them if they are the only peer in a swarm.
if len(peers) < numWant || len(peers) == 0 { if len(peers) == 0 {
return append(peers, p), nil if seeding {
resp.Complete++
} else {
resp.Incomplete++
}
peers = append(peers, req.Peer)
} }
peers[len(peers)-1] = p switch len(req.IP) {
return peers, nil case net.IPv4len:
resp.IPv4Peers = peers
case net.IPv6len:
resp.IPv6Peers = peers
default:
panic("peer IP is not IPv4 or IPv6 length")
}
return nil
} }
func (h *responseHook) HandleScrape(ctx context.Context, req *bittorrent.ScrapeRequest, resp *bittorrent.ScrapeResponse) (context.Context, error) { func (h *responseHook) HandleScrape(ctx context.Context, req *bittorrent.ScrapeRequest, resp *bittorrent.ScrapeResponse) (context.Context, error) {