From c0569c7fa1e25599b3f1d6a16b15ec23052021da Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Sat, 16 Apr 2016 18:30:03 -0400
Subject: net: Add most functions needed for vNodes to CConnman

---
 src/rpc/misc.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/rpc/misc.cpp')

diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index e96feaa86..f9f161561 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -89,7 +89,8 @@ UniValue getinfo(const UniValue& params, bool fHelp)
 #endif
     obj.push_back(Pair("blocks",        (int)chainActive.Height()));
     obj.push_back(Pair("timeoffset",    GetTimeOffset()));
-    obj.push_back(Pair("connections",   (int)vNodes.size()));
+    if(g_connman)
+        obj.push_back(Pair("connections",   (int)g_connman->GetNodeCount(CConnman::CONNECTIONS_ALL)));
     obj.push_back(Pair("proxy",         (proxy.IsValid() ? proxy.proxy.ToStringIPPort() : string())));
     obj.push_back(Pair("difficulty",    (double)GetDifficulty()));
     obj.push_back(Pair("testnet",       Params().TestnetToBeDeprecatedFieldRPC()));
-- 
cgit v1.2.3


From 53347f0cb99e514815e44a56439a4a10012238f8 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Sat, 16 Apr 2016 19:13:12 -0400
Subject: net: create generic functor accessors and move vNodes to CConnman

---
 src/rpc/misc.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/rpc/misc.cpp')

diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index f9f161561..ffd377b48 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -472,14 +472,17 @@ UniValue setmocktime(const UniValue& params, bool fHelp)
     // atomically with the time change to prevent peers from being
     // disconnected because we think we haven't communicated with them
     // in a long time.
-    LOCK2(cs_main, cs_vNodes);
+    LOCK(cs_main);
 
     RPCTypeCheck(params, boost::assign::list_of(UniValue::VNUM));
     SetMockTime(params[0].get_int64());
 
     uint64_t t = GetTime();
-    BOOST_FOREACH(CNode* pnode, vNodes) {
-        pnode->nLastSend = pnode->nLastRecv = t;
+    if(g_connman) {
+        g_connman->ForEachNode([t](CNode* pnode) {
+            pnode->nLastSend = pnode->nLastRecv = t;
+            return true;
+        });
     }
 
     return NullUniValue;
-- 
cgit v1.2.3


From d1a2295f0d58423652b124b48fc887a9721b765c Mon Sep 17 00:00:00 2001
From: Jeremy Rubin <jeremy.l.rubin@gmail.com>
Date: Wed, 15 Jun 2016 19:28:04 -0400
Subject: Made the ForEachNode* functions in src/net.cpp more pragmatic and
 self documenting

---
 src/rpc/misc.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/rpc/misc.cpp')

diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index ffd377b48..2b5782367 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -481,7 +481,6 @@ UniValue setmocktime(const UniValue& params, bool fHelp)
     if(g_connman) {
         g_connman->ForEachNode([t](CNode* pnode) {
             pnode->nLastSend = pnode->nLastRecv = t;
-            return true;
         });
     }
 
-- 
cgit v1.2.3