Merge pull request #3053 from dajohi/master

gavinandresen · gavinandresen · commit 1c4994253cb1 · 2013-10-05T21:37:13.000-07:00
Hurricane Electric uses block 2001:470::, not 2011:470::
diff --git a/src/netbase.cpp b/src/netbase.cpp
@@ -864,7 +864,7 @@ std::vector<unsigned char> CNetAddr::GetGroup() const
         nBits = 4;
     }
     // for he.net, use /36 groups
-    else if (GetByte(15) == 0x20 && GetByte(14) == 0x11 && GetByte(13) == 0x04 && GetByte(12) == 0x70)
+    else if (GetByte(15) == 0x20 && GetByte(14) == 0x01 && GetByte(13) == 0x04 && GetByte(12) == 0x70)
         nBits = 36;
     // for the rest of the IPv6 network, use /32 groups
     else

Original file line number	Diff line number	Diff line change
`@@ -864,7 +864,7 @@ std::vector<unsigned char> CNetAddr::GetGroup() const`
`864`	`864`	`nBits = 4;`
`865`	`865`	`}`
`866`	`866`	`// for he.net, use /36 groups`
`867`		`- else if (GetByte(15) == 0x20 && GetByte(14) == 0x11 && GetByte(13) == 0x04 && GetByte(12) == 0x70)`
	`867`	`+ else if (GetByte(15) == 0x20 && GetByte(14) == 0x01 && GetByte(13) == 0x04 && GetByte(12) == 0x70)`
`868`	`868`	`nBits = 36;`
`869`	`869`	`// for the rest of the IPv6 network, use /32 groups`
`870`	`870`	`else`