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

rm extra if; add missing expr for ipv6 subnet

Browse source
This commit is contained in:
Jimmy Zelinskie 2014-07-17 08:27:08 -04:00
parent f54f688ab2
commit 809735c504
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tracker/announce.go
View file

@ -257,17 +257,15 @@ func appendSubnetPeers(ipv4s, ipv6s models.PeerList, ann *models.Announce, annou
} }
if ip := peer.IP.To4(); len(ip) == 4 { if ip := peer.IP.To4(); len(ip) == 4 {
if peersLeftInSubnet && ipv4Subnet { if peersLeftInSubnet && ipv4Subnet && subnet.Contains(ip) {
if subnet.Contains(ip) {
ipv4s = append(ipv4s, peer) ipv4s = append(ipv4s, peer)
count++ count++
}
} else if !peersLeftInSubnet && !subnet.Contains(ip) { } else if !peersLeftInSubnet && !subnet.Contains(ip) {
ipv4s = append(ipv4s, peer) ipv4s = append(ipv4s, peer)
count++ count++
} }
} else if ip := peer.IP.To16(); len(ip) == 16 { } else if ip := peer.IP.To16(); len(ip) == 16 {
if peersLeftInSubnet && ipv6Subnet { if peersLeftInSubnet && ipv6Subnet && subnet.Contains(ip) {
ipv6s = append(ipv6s, peer) ipv6s = append(ipv6s, peer)
count++ count++
} else if !peersLeftInSubnet && !subnet.Contains(ip) { } else if !peersLeftInSubnet && !subnet.Contains(ip) {