quick hack for fRelayTxes race

theuni · theuni · commit c6a93bd53132 · 2017-02-09T18:36:10.000-05:00
diff --git a/src/net.cpp b/src/net.cpp
@@ -922,24 +922,24 @@ static bool CompareNodeTXTime(const NodeEvictionCandidate &a, const NodeEviction
  */
 bool CConnman::AttemptToEvictConnection()
 {
-    std::vector<NodeEvictionCandidate> vEvictionCandidates;
+    std::vector<CNode*> vNodesCopy;
     {
         LOCK(cs_vNodes);
-
-        BOOST_FOREACH(CNode *node, vNodes) {
-            if (node->fWhitelisted)
-                continue;
-            if (!node->fInbound)
-                continue;
-            if (node->fDisconnect)
-                continue;
+        vNodesCopy = vNodes;
+        for(CNode* pnode : vNodes)
+            pnode->AddRef();
+    }
+    std::vector<NodeEvictionCandidate> vEvictionCandidates;
+    for(CNode* node : vNodesCopy) {
+        if (!node->fWhitelisted && node->fInbound && node->fDisconnect) {
             LOCK(node->cs_filter);
             NodeEvictionCandidate candidate = {node->id, node->nTimeConnected, node->nMinPingUsecTime,
                                                node->nLastBlockTime, node->nLastTXTime,
                                                (node->nServices & nRelevantServices) == nRelevantServices,
                                                node->fRelayTxes, node->pfilter != NULL, node->addr, node->nKeyedNetGroup};
             vEvictionCandidates.push_back(candidate);
         }
+        node->Release();
     }
 
     if (vEvictionCandidates.empty()) return false;
