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

re-ordering; logic fix in validateAnnounceQuery

Browse source
This commit is contained in:
Jimmy Zelinskie 2013-07-19 23:00:33 -04:00
parent fc39a4aed3
commit dae48d0c3b
1 changed files with 12 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
server/announce.go
View file

@ -6,7 +6,6 @@ package server
import (
"errors"
"fmt"
"log"
"net/http"
"path"
@ -45,6 +44,13 @@ func (s *Server) serveAnnounce(w http.ResponseWriter, r *http.Request) {
return
}
if s.conf.Slots && user.Slots != -1 && left != 0 {
if user.UsedSlots >= user.Slots {
fail(errors.New("You've run out of download slots."), w, r)
return
}
}
tx, err := s.dataStore.Begin()
if err != nil {
log.Panicf("server: %s", err)
@ -55,24 +61,10 @@ func (s *Server) serveAnnounce(w http.ResponseWriter, r *http.Request) {
if err != nil {
log.Panicf("server: %s", err)
}
} else if torrent.Pruned {
e := fmt.Errorf("This torrent does not exist (pruned: %t, left: %d)", torrent.Pruned, left)
fail(e, w, r)
return
}
if s.conf.Slots && user.Slots != -1 && left != 0 {
if user.UsedSlots >= user.Slots {
fail(errors.New("You've run out of download slots."), w, r)
return
}
}
_, isLeecher := torrent.Leechers[peerID]
_, isSeeder := torrent.Seeders[peerID]
completed := "completed" == event
if event == "stopped" || event == "paused" {
if left == 0 {
err := tx.RmSeeder(torrent.ID, peerID)
@ -89,7 +81,7 @@ func (s *Server) serveAnnounce(w http.ResponseWriter, r *http.Request) {
log.Panicf("server: %s", err)
}
}
} else if completed {
} else if event == "completed" {
err := tx.Snatch(user.ID, torrent.ID)
if err != nil {
log.Panicf("server: %s", err)
@ -117,10 +109,10 @@ func (s *Server) validateAnnounceQuery(r *http.Request) (compact bool, numWant i
if infohash == "" ||
peerID == "" ||
ip == "" ||
portErr == nil ||
uploadedErr == nil ||
downloadedErr == nil ||
leftErr == nil {
portErr != nil ||
uploadedErr != nil ||
downloadedErr != nil ||
leftErr != nil {
return false, 0, "", "", "", "", 0, 0, 0, 0, errors.New("Malformed request")
}
return