Don't do mempool lookups for "mempool" command without a filter

Github-Pull: #7174 Rebased-From: 96918a2
bitcoin · Dec 7, 2015 · 82aff88 · 82aff88
1 parent f31955d
commit 82aff88
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -4994,12 +4994,13 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         vector<CInv> vInv;
         BOOST_FOREACH(uint256& hash, vtxid) {
             CInv inv(MSG_TX, hash);
-            CTransaction tx;
+            if (pfrom->pfilter) {
-            bool fInMemPool = mempool.lookup(hash, tx);
+                CTransaction tx;
-            if (!fInMemPool) continue; // another thread removed since queryHashes, maybe...
+                bool fInMemPool = mempool.lookup(hash, tx);
-            if ((pfrom->pfilter && pfrom->pfilter->IsRelevantAndUpdate(tx)) ||
+                if (!fInMemPool) continue; // another thread removed since queryHashes, maybe...
-               (!pfrom->pfilter))
+                if (!pfrom->pfilter->IsRelevantAndUpdate(tx)) continue;
-                vInv.push_back(inv);
+            }
+            vInv.push_back(inv);
             if (vInv.size() == MAX_INV_SZ) {
                 pfrom->PushMessage("inv", vInv);
                 vInv.clear();