net: move whitelist functions into CConnman

1 files changed, 8 insertions, 8 deletions

diff --git a/src/net.h b/src/net.h
index 5b1e80bfbe..8d9925265d 100644
--- a/src/net.h
+++ b/src/net.h
@@ -169,6 +169,7 @@ public:
     bool DisconnectNode(NodeId id);
     bool DisconnectSubnet(const CSubNet& subnet);
 
+    void AddWhitelistedRange(const CSubNet &subnet);
 private:
     struct ListenSocket {
         SOCKET socket;
@@ -192,6 +193,8 @@ private:
 
     bool AttemptToEvictConnection();
     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();
@@ -203,6 +206,11 @@ private:
     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;
+    CCriticalSection cs_vWhitelistedRange;
+
     std::vector<ListenSocket> vhListenSocket;
     banmap_t setBanned;
     CCriticalSection cs_setBanned;
@@ -432,11 +440,6 @@ public:
     const uint64_t nKeyedNetGroup;
 protected:
 
-    // Whitelisted ranges. Any node connecting from these is automatically
-    // whitelisted (as well as those connecting to whitelisted binds).
-    static std::vector<CSubNet> vWhitelistedRange;
-    static CCriticalSection cs_vWhitelistedRange;
-
     mapMsgCmdSize mapSendBytesPerMsgCmd;
     mapMsgCmdSize mapRecvBytesPerMsgCmd;
 
@@ -803,9 +806,6 @@ public:
 
     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);