net: move whitelist functions into CConnman

theuni · Fuzzbawls · commit 3804c299750a · 2020-08-25T15:17:07.000-07:00
diff --git a/src/init.cpp b/src/init.cpp
@@ -1333,7 +1333,7 @@ bool AppInit2()
             LookupSubNet(net.c_str(), subnet);
             if (!subnet.IsValid())
                 return UIError(strprintf(_("Invalid netmask specified in -whitelist: '%s'"), net));
-            CNode::AddWhitelistedRange(subnet);
+            connman.AddWhitelistedRange(subnet);
         }
     }
 
diff --git a/src/net.cpp b/src/net.cpp
@@ -665,10 +665,7 @@ void CConnman::SetBannedSetDirty(bool dirty)
 }
 
 
-std::vector<CSubNet> CNode::vWhitelistedRange;
-RecursiveMutex CNode::cs_vWhitelistedRange;
-
-bool CNode::IsWhitelistedRange(const CNetAddr& addr)
+bool CConnman::IsWhitelistedRange(const CNetAddr& addr)
 {
     LOCK(cs_vWhitelistedRange);
     for (const CSubNet& subnet : vWhitelistedRange) {
@@ -678,7 +675,7 @@ bool CNode::IsWhitelistedRange(const CNetAddr& addr)
     return false;
 }
 
-void CNode::AddWhitelistedRange(const CSubNet& subnet)
+void CConnman::AddWhitelistedRange(const CSubNet& subnet)
 {
     LOCK(cs_vWhitelistedRange);
     vWhitelistedRange.push_back(subnet);
@@ -1012,7 +1009,7 @@ void CConnman::AcceptConnection(const ListenSocket& hListenSocket) {
         if (!addr.SetSockAddr((const struct sockaddr*)&sockaddr))
             LogPrintf("Warning: Unknown socket family\n");
 
-    bool whitelisted = hListenSocket.whitelisted || CNode::IsWhitelistedRange(addr);
+    bool whitelisted = hListenSocket.whitelisted || IsWhitelistedRange(addr);
     {
         LOCK(cs_vNodes);
         for (CNode* pnode : vNodes)
diff --git a/src/net.h b/src/net.h
@@ -179,6 +179,7 @@ class CConnman
     bool DisconnectNode(NodeId id);
     bool DisconnectSubnet(const CSubNet& subnet);
 
+    void AddWhitelistedRange(const CSubNet& subnet);
 private:
     struct ListenSocket {
         SOCKET socket;
@@ -202,6 +203,8 @@ class CConnman
 
     bool AttemptToEvictConnection(bool fPreferNewConnection);
     CNode* ConnectNode(CAddress addrConnect, const char* pszDest, bool fCountFailure);
+    bool IsWhitelistedRange(const CNetAddr &addr);
+
     void DeleteNode(CNode* pnode);
     //!check is the banlist has unwritten changes
     bool BannedSetIsDirty();
@@ -213,6 +216,11 @@ class CConnman
     void DumpData();
     void DumpBanlist();
 
+    // Whitelisted ranges. Any node connecting from these is automatically
+    // whitelisted (as well as those connecting to whitelisted binds).
+    std::vector<CSubNet> vWhitelistedRange;
+    RecursiveMutex cs_vWhitelistedRange;
+
     std::vector<ListenSocket> vhListenSocket;
     banmap_t setBanned;
     RecursiveMutex cs_setBanned;
@@ -440,11 +448,6 @@ class CNode
 protected:
     std::vector<std::string> vecRequestsFulfilled; //keep track of what client has asked for
 
-    // Whitelisted ranges. Any node connecting from these is automatically
-    // whitelisted (as well as those connecting to whitelisted binds).
-    static std::vector<CSubNet> vWhitelistedRange;
-    static RecursiveMutex cs_vWhitelistedRange;
-
     // Basic fuzz-testing
     void Fuzz(int nChance); // modifies ssSend
 
@@ -792,9 +795,6 @@ class CNode
 
     void copyStats(CNodeStats& stats);
 
-    static bool IsWhitelistedRange(const CNetAddr& ip);
-    static void AddWhitelistedRange(const CSubNet& subnet);
-
     // Network stats
     static void RecordBytesRecv(uint64_t bytes);
     static void RecordBytesSent(uint64_t bytes);

Original file line number	Diff line number	Diff line change
`@@ -1333,7 +1333,7 @@ bool AppInit2()`
`1333`	`1333`	`LookupSubNet(net.c_str(), subnet);`
`1334`	`1334`	`if (!subnet.IsValid())`
`1335`	`1335`	`return UIError(strprintf(_("Invalid netmask specified in -whitelist: '%s'"), net));`
`1336`		`- CNode::AddWhitelistedRange(subnet);`
	`1336`	`+ connman.AddWhitelistedRange(subnet);`
`1337`	`1337`	`}`
`1338`	`1338`	`}`
`1339`	`1339`
Original file line number	Diff line number	Diff line change
`@@ -665,10 +665,7 @@ void CConnman::SetBannedSetDirty(bool dirty)`
`665`	`665`	`}`
`666`	`666`
`667`	`667`
`668`		`-std::vector<CSubNet> CNode::vWhitelistedRange;`
`669`		`-RecursiveMutex CNode::cs_vWhitelistedRange;`
`670`		`-`
`671`		`-bool CNode::IsWhitelistedRange(const CNetAddr& addr)`
	`668`	`+bool CConnman::IsWhitelistedRange(const CNetAddr& addr)`
`672`	`669`	`{`
`673`	`670`	`LOCK(cs_vWhitelistedRange);`
`674`	`671`	`for (const CSubNet& subnet : vWhitelistedRange) {`
`@@ -678,7 +675,7 @@ bool CNode::IsWhitelistedRange(const CNetAddr& addr)`
`678`	`675`	`return false;`
`679`	`676`	`}`
`680`	`677`
`681`		`-void CNode::AddWhitelistedRange(const CSubNet& subnet)`
	`678`	`+void CConnman::AddWhitelistedRange(const CSubNet& subnet)`
`682`	`679`	`{`
`683`	`680`	`LOCK(cs_vWhitelistedRange);`
`684`	`681`	`vWhitelistedRange.push_back(subnet);`
`@@ -1012,7 +1009,7 @@ void CConnman::AcceptConnection(const ListenSocket& hListenSocket) {`
`1012`	`1009`	`if (!addr.SetSockAddr((const struct sockaddr*)&sockaddr))`
`1013`	`1010`	`LogPrintf("Warning: Unknown socket family\n");`
`1014`	`1011`
`1015`		`- bool whitelisted = hListenSocket.whitelisted \|\| CNode::IsWhitelistedRange(addr);`
	`1012`	`+ bool whitelisted = hListenSocket.whitelisted \|\| IsWhitelistedRange(addr);`
`1016`	`1013`	`{`
`1017`	`1014`	`LOCK(cs_vNodes);`
`1018`	`1015`	`for (CNode* pnode : vNodes)`