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

http: fix encoding of IPv4 peers with 16-byte addresses

Browse source
This commit is contained in:
Leo Balduf 2016-08-18 10:15:07 -04:00
parent f6e362e506
commit d794f92c14
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
frontend/http/writer.go
View file

@ -36,7 +36,7 @@ func WriteAnnounceResponse(w http.ResponseWriter, resp *bittorrent.AnnounceRespo
// Add the IPv4 peers to the dictionary. // Add the IPv4 peers to the dictionary.
for _, peer := range resp.IPv4Peers { for _, peer := range resp.IPv4Peers {
IPv4CompactDict = append(IPv4CompactDict, compact(peer)...) IPv4CompactDict = append(IPv4CompactDict, compact4(peer)...)
} }
if len(IPv4CompactDict) > 0 { if len(IPv4CompactDict) > 0 {
bdict["peers"] = IPv4CompactDict bdict["peers"] = IPv4CompactDict
@ -44,7 +44,7 @@ func WriteAnnounceResponse(w http.ResponseWriter, resp *bittorrent.AnnounceRespo
// Add the IPv6 peers to the dictionary. // Add the IPv6 peers to the dictionary.
for _, peer := range resp.IPv6Peers { for _, peer := range resp.IPv6Peers {
IPv6CompactDict = append(IPv6CompactDict, compact(peer)...) IPv6CompactDict = append(IPv6CompactDict, compact6(peer)...)
} }
if len(IPv6CompactDict) > 0 { if len(IPv6CompactDict) > 0 {
bdict["peers6"] = IPv6CompactDict bdict["peers6"] = IPv6CompactDict
@ -82,8 +82,23 @@ func WriteScrapeResponse(w http.ResponseWriter, resp *bittorrent.ScrapeResponse)
}) })
} }
func compact(peer bittorrent.Peer) (buf []byte) { func compact4(peer bittorrent.Peer) (buf []byte) {
buf = []byte(peer.IP) if ip := peer.IP.To4(); ip == nil {
panic("non-IPv4 IP for Peer in IPv4Peers")
} else {
buf = []byte(ip)
}
buf = append(buf, byte(peer.Port>>8))
buf = append(buf, byte(peer.Port&0xff))
return
}
func compact6(peer bittorrent.Peer) (buf []byte) {
if ip := peer.IP.To16(); ip == nil {
panic("non-IPv6 IP for Peer in IPv6Peers")
} else {
buf = []byte(ip)
}
buf = append(buf, byte(peer.Port>>8)) buf = append(buf, byte(peer.Port>>8))
buf = append(buf, byte(peer.Port&0xff)) buf = append(buf, byte(peer.Port&0xff))
return return