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

udp: Clean up connection ID checking

Browse source
This commit is contained in:
Justin Li 2015-02-20 12:52:49 -05:00
parent 9526df74ad
commit 0d33210901
1 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
udp/protocol.go
View file

@ -58,6 +58,17 @@ func (s *Server) handlePacket(packet []byte, addr *net.UDPAddr) (response []byte
transactionID: transactionID, transactionID: transactionID,
} }
defer func() {
if writer.buf.Len() > 0 {
response = writer.buf.Bytes()
}
}()
if action != 0 && !bytes.Equal(connID, generatedConnID) {
writer.WriteError(errBadConnectionID)
return
}
switch action { switch action {
case 0: case 0:
// Connect request. // Connect request.
@ -71,9 +82,6 @@ func (s *Server) handlePacket(packet []byte, addr *net.UDPAddr) (response []byte
case 1: case 1:
// Announce request. // Announce request.
if !bytes.Equal(connID, generatedConnID) {
writer.WriteError(errBadConnectionID)
} else {
ann, err := s.newAnnounce(packet, addr.IP) ann, err := s.newAnnounce(packet, addr.IP)
if err == nil { if err == nil {
@ -81,13 +89,9 @@ func (s *Server) handlePacket(packet []byte, addr *net.UDPAddr) (response []byte
} }
handleTorrentError(err, writer) handleTorrentError(err, writer)
}
case 2: case 2:
// Scrape request. // Scrape request.
if !bytes.Equal(connID, generatedConnID) {
writer.WriteError(errBadConnectionID)
} else {
scrape, err := s.newScrape(packet) scrape, err := s.newScrape(packet)
if err == nil { if err == nil {
@ -96,11 +100,7 @@ func (s *Server) handlePacket(packet []byte, addr *net.UDPAddr) (response []byte
handleTorrentError(err, writer) handleTorrentError(err, writer)
} }
}
if writer.buf.Len() > 0 {
response = writer.buf.Bytes()
}
return return
} }
@ -166,6 +166,7 @@ func (s *Server) newScrape(packet []byte) (*models.Scrape, error) {
for len(packet) >= 20 { for len(packet) >= 20 {
infohash := packet[:20] infohash := packet[:20]
infohashes = append(infohashes, string(infohash)) infohashes = append(infohashes, string(infohash))
packet = packet[20:]
} }
return &models.Scrape{ return &models.Scrape{