net: extract conditional to bool CNetAddr::IsHeNet

Remove redundant public declaration and mention if mapped_as is only available if the asmap config flag is set.
PIVX-Project · Jul 28, 2021 · 65cd143 · 65cd143
1 parent 2fc1f37
commit 65cd143
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/netaddress.cpp b/src/netaddress.cpp
@@ -174,6 +174,11 @@ bool CNetAddr::IsRFC4843() const
     return (GetByte(15) == 0x20 && GetByte(14) == 0x01 && GetByte(13) == 0x00 && (GetByte(12) & 0xF0) == 0x10);
 }
 
+bool CNetAddr::IsHeNet() const
+{
+    return (GetByte(15) == 0x20 && GetByte(14) == 0x01 && GetByte(13) == 0x04 && GetByte(12) == 0x70);
+}
+
 bool CNetAddr::IsTor() const
 {
     return (memcmp(ip, pchOnionCat, sizeof(pchOnionCat)) == 0);
@@ -432,7 +437,7 @@ std::vector<unsigned char> CNetAddr::GetGroup(const std::vector<bool> &asmap) co
     } else if (IsTor()) {
         nStartByte = 6;
         nBits = 4;
-    } else if (GetByte(15) == 0x20 && GetByte(14) == 0x01 && GetByte(13) == 0x04 && GetByte(12) == 0x70) {
+    } else if (IsHeNet()) {
         // for he.net, use /36 groups
         nBits = 36;
     } else {

diff --git a/src/netaddress.h b/src/netaddress.h
@@ -57,7 +57,7 @@ class CNetAddr
     bool IsIPv4() const;                         // IPv4 mapped address (::FFFF:0:0/96, 0.0.0.0/0)
     bool IsIPv6() const;                         // IPv6 address (not mapped IPv4, not Tor)
     bool IsRFC1918() const;                      // IPv4 private networks (10.0.0.0/8, 192.168.0.0/16, 172.16.0.0/12)
-    bool IsRFC2544() const;                      // IPv4 inter-network communcations (192.18.0.0/15)
+    bool IsRFC2544() const;                      // IPv4 inter-network communications (198.18.0.0/15)
     bool IsRFC6598() const;                      // IPv4 ISP-level NAT (100.64.0.0/10)
     bool IsRFC5737() const;                      // IPv4 documentation addresses (192.0.2.0/24, 198.51.100.0/24, 203.0.113.0/24)
     bool IsRFC3849() const;                      // IPv6 documentation address (2001:0DB8::/32)
@@ -69,6 +69,7 @@ class CNetAddr
     bool IsRFC4862() const;                      // IPv6 autoconfig (FE80::/64)
     bool IsRFC6052() const;                      // IPv6 well-known prefix (64:FF9B::/96)
     bool IsRFC6145() const;                      // IPv6 IPv4-translated address (::FFFF:0:0:0/96)
+    bool IsHeNet() const;                        // IPv6 Hurricane Electric - https://he.net (2001:0470::/36)
     bool IsTor() const;
     bool IsLocal() const;
     bool IsRoutable() const;

diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
@@ -76,7 +76,8 @@ UniValue getpeerinfo(const JSONRPCRequest& request)
             "    \"id\": n,                   (numeric) Peer index\n"
             "    \"addr\":\"host:port\",      (string) The ip address and port of the peer\n"
             "    \"addrlocal\":\"ip:port\",   (string) local address\n"
-            "    \"mapped_as\":\"mapped_as\", (string) The AS in the BGP route to the peer used for diversifying peer selection\n"
+            "    \"mapped_as\":\"mapped_as\", (string) The AS in the BGP route to the peer used for diversifying\n"
+                                                       "peer selection (only available if the asmap config flag is set)\n"
             "    \"services\":\"xxxxxxxxxxxxxxxx\",   (string) The services offered\n"
             "    \"lastsend\": ttt,           (numeric) The time in seconds since epoch (Jan 1 1970 GMT) of the last send\n"
             "    \"lastrecv\": ttt,           (numeric) The time in seconds since epoch (Jan 1 1970 GMT) of the last receive\n"