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

udp: handleOptionalParameters method added

Browse source 
This also addresses an issue where the goroutine was not breaking out of
the loop parsing the options, instead it was only breaking out of the
switch statement.
This commit is contained in:
Jimmy Zelinskie 2015-04-06 19:06:06 -04:00
parent d317dfc069
commit cf3806cb9b
1 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
udp/protocol.go
View file

@ -150,15 +150,34 @@ func (s *Server) newAnnounce(packet []byte, ip net.IP) (*models.Announce, error)
numWant := binary.BigEndian.Uint32(packet[92:96]) numWant := binary.BigEndian.Uint32(packet[92:96])
port := binary.BigEndian.Uint16(packet[96:98]) port := binary.BigEndian.Uint16(packet[96:98])
// Optionally, parse the optional parameteres as described in BEP41. announce := &models.Announce{
var IPv6Endpoint models.Endpoint Config: s.config,
Downloaded: downloaded,
Event: eventIDs[eventID],
IPv4: models.Endpoint{
IP: ip,
Port: port,
},
Infohash: string(infohash),
Left: left,
NumWant: int(numWant),
PeerID: string(peerID),
Uploaded: uploaded,
}
return s.handleOptionalParameters(packet, announce)
}
// HandleOptionalParameters parses the optional parameters as described in BEP41
// and updates an announce with the values parsed.
func (s *Server) handleOptionalParameters(packet []byte, announce *models.Announce) (*models.Announce, error) {
if len(packet) > 98 { if len(packet) > 98 {
optionStartIndex := 98 optionStartIndex := 98
for optionStartIndex < len(packet)-1 { for optionStartIndex < len(packet)-1 {
option := packet[optionStartIndex] option := packet[optionStartIndex]
switch option { switch option {
case optionEndOfOptions: case optionEndOfOptions:
break return announce, nil
case optionNOP: case optionNOP:
optionStartIndex++ optionStartIndex++
@ -184,9 +203,9 @@ func (s *Server) newAnnounce(packet []byte, ip net.IP) (*models.Announce, error)
ipv6bytes := packet[optionStartIndex+1 : optionStartIndex+17] ipv6bytes := packet[optionStartIndex+1 : optionStartIndex+17]
if s.config.AllowIPSpoofing && !bytes.Equal(ipv6bytes, emptyIPv6) { if s.config.AllowIPSpoofing && !bytes.Equal(ipv6bytes, emptyIPv6) {
IPv6Endpoint.IP = net.ParseIP(string(ipv6bytes)).To16() announce.IPv6.IP = net.ParseIP(string(ipv6bytes)).To16()
IPv6Endpoint.Port = binary.BigEndian.Uint16(packet[optionStartIndex+17 : optionStartIndex+19]) announce.IPv6.Port = binary.BigEndian.Uint16(packet[optionStartIndex+17 : optionStartIndex+19])
if IPv6Endpoint.IP == nil { if announce.IPv6.IP == nil {
return nil, errMalformedIP return nil, errMalformedIP
} }
} }
@ -194,23 +213,13 @@ func (s *Server) newAnnounce(packet []byte, ip net.IP) (*models.Announce, error)
optionStartIndex += 19 optionStartIndex += 19
default: default:
break return announce, nil
} }
} }
} }
return &models.Announce{ // There was no optional parameters to parse.
Config: s.config, return announce, nil
Downloaded: downloaded,
Event: eventIDs[eventID],
IPv4: models.Endpoint{ip, port},
IPv6: IPv6Endpoint,
Infohash: string(infohash),
Left: left,
NumWant: int(numWant),
PeerID: string(peerID),
Uploaded: uploaded,
}, nil
} }
// newScrape decodes one announce packet, returning a models.Scrape. // newScrape decodes one announce packet, returning a models.Scrape.