From 0acd038eb65cbb845ba72bebe111529edc8ec93e Mon Sep 17 00:00:00 2001 From: David Hill Date: Wed, 4 Jun 2014 19:11:47 -0400 Subject: [PATCH] Use the correct network block for he.net. --- addrmanager.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/addrmanager.go b/addrmanager.go index cbdca7a2..4283901d 100644 --- a/addrmanager.go +++ b/addrmanager.go @@ -1209,12 +1209,10 @@ func GroupKey(na *btcwire.NetAddress) string { } // OK, so now we know ourselves to be a IPv6 address. - // bitcoind uses /32 for everything but what it calls he.net, which is - // it uses /36 for. he.net is actualy 2001:470::/32, whereas bitcoind - // counts it as 2011:470::/32. - + // bitcoind uses /32 for everything, except for Hurricane Electric's + // (he.net) IP range, which it uses /36 for. bits := 32 - heNet := &net.IPNet{IP: net.ParseIP("2011:470::"), + heNet := &net.IPNet{IP: net.ParseIP("2001:470::"), Mask: net.CIDRMask(32, 128)} if heNet.Contains(na.IP) { bits = 36