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

Calculate up/down delta before altering peer

Browse source
This commit is contained in:
Jimmy Zelinskie 2014-08-01 15:11:37 -04:00
parent f48e1e452f
commit f747a79c8c
2 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
tracker/announce.go
View file

@ -54,6 +54,8 @@ func (tkr *Tracker) HandleAnnounce(ann *models.Announce, w Writer) error {
ann.BuildPeer(user, torrent)
uploaded, downloaded := delta(ann)
created, err := updateSwarm(conn, ann)
if err != nil {
return err
@ -65,8 +67,15 @@ func (tkr *Tracker) HandleAnnounce(ann *models.Announce, w Writer) error {
}
if tkr.cfg.PrivateEnabled {
delta := models.NewAnnounceDelta(ann, created, snatched)
err = tkr.backend.RecordAnnounce(delta)
err = tkr.backend.RecordAnnounce(&models.AnnounceDelta{
Peer: ann.Peer,
Torrent: ann.Torrent,
User: ann.User,
Created: created,
Snatched: snatched,
Uploaded: uploaded,
Downloaded: downloaded,
})
if err != nil {
return err
}
@ -80,6 +89,31 @@ func (tkr *Tracker) HandleAnnounce(ann *models.Announce, w Writer) error {
return w.WriteAnnounce(newAnnounceResponse(ann))
}
func delta(a *models.Announce) (uploaded, downloaded uint64) {
var (
rawDeltaUp = a.Peer.Uploaded - a.Uploaded
rawDeltaDown uint64
)
if !a.Config.FreeleechEnabled {
rawDeltaDown = a.Peer.Downloaded - a.Downloaded
}
// Restarting a torrent may cause a delta to be negative.
if rawDeltaUp < 0 {
rawDeltaUp = 0
}
if rawDeltaDown < 0 {
rawDeltaDown = 0
}
uploaded = uint64(float64(rawDeltaUp) * a.User.UpMultiplier * a.Torrent.UpMultiplier)
downloaded = uint64(float64(rawDeltaDown) * a.User.DownMultiplier * a.Torrent.DownMultiplier)
return
}
// updateSwarm handles the changes to a torrent's swarm given an announce.
func updateSwarm(c Conn, ann *models.Announce) (created bool, err error) {
var createdv4, createdv6 bool

34
tracker/models/models.go
View file

@ -239,40 +239,6 @@ type AnnounceResponse struct {
Compact bool
}
// NewAnnounceDelta calculates a Peer's download and upload deltas between
// Announces and generates an AnnounceDelta.
func NewAnnounceDelta(a *Announce, created, snatched bool) *AnnounceDelta {
var (
rawDeltaUp = a.Peer.Uploaded - a.Uploaded
rawDeltaDown uint64
)
if !a.Config.FreeleechEnabled {
rawDeltaDown = a.Peer.Downloaded - a.Downloaded
}
// Restarting a torrent may cause a delta to be negative.
if rawDeltaUp < 0 {
rawDeltaUp = 0
}
if rawDeltaDown < 0 {
rawDeltaDown = 0
}
return &AnnounceDelta{
Peer: a.Peer,
Torrent: a.Torrent,
User: a.User,
Created: created,
Snatched: snatched,
Uploaded: uint64(float64(rawDeltaUp) * a.User.UpMultiplier * a.Torrent.UpMultiplier),
Downloaded: uint64(float64(rawDeltaDown) * a.User.DownMultiplier * a.Torrent.DownMultiplier),
}
}
// Scrape is a Scrape by a Peer.
type Scrape struct {
Config *config.Config `json:"config"`