Invoke DisconnectNodes from getconnectioncount/getpeerinfo/getnetwork…

…info This ensures disconnected nodes don't appear for callers
dashpay · Apr 17, 2020 · 2f1b3a3 · 2f1b3a3
1 parent 3054854
commit 2f1b3a3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/net.h b/src/net.h
@@ -452,6 +452,7 @@ class CConnman
 
     void WakeMessageHandler();
     void WakeSelect();
+    void DisconnectNodes();
 
     /** Attempts to obfuscate tx time through exponentially distributed emitting.
         Works assuming that a single interval is used.
@@ -476,7 +477,6 @@ class CConnman
     void ThreadOpenConnections(std::vector<std::string> connect);
     void ThreadMessageHandler();
     void AcceptConnection(const ListenSocket& hListenSocket);
-    void DisconnectNodes();
     void NotifyNumConnectionsChanged();
     void InactivityCheck(CNode *pnode);
     bool GenerateSelectSet(std::set<SOCKET> &recv_set, std::set<SOCKET> &send_set, std::set<SOCKET> &error_set);

diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
@@ -40,6 +40,7 @@ UniValue getconnectioncount(const JSONRPCRequest& request)
     if(!g_connman)
         throw JSONRPCError(RPC_CLIENT_P2P_DISABLED, "Error: Peer-to-peer functionality missing or disabled");
 
+    g_connman->DisconnectNodes();
     return (int)g_connman->GetNodeCount(CConnman::CONNECTIONS_ALL);
 }
 
@@ -126,6 +127,8 @@ UniValue getpeerinfo(const JSONRPCRequest& request)
     if(!g_connman)
         throw JSONRPCError(RPC_CLIENT_P2P_DISABLED, "Error: Peer-to-peer functionality missing or disabled");
 
+    g_connman->DisconnectNodes();
+
     std::vector<CNodeStats> vstats;
     g_connman->GetNodeStats(vstats);
 
@@ -466,6 +469,10 @@ UniValue getnetworkinfo(const JSONRPCRequest& request)
             + HelpExampleRpc("getnetworkinfo", "")
         );
 
+    if (g_connman) {
+        g_connman->DisconnectNodes();
+    }
+
     LOCK(cs_main);
     UniValue obj(UniValue::VOBJ);
     obj.push_back(Pair("version",       CLIENT_VERSION));