From 36f14bf2e770220a3878da45722352553eb665cc Mon Sep 17 00:00:00 2001 From: Tom Harding Date: Mon, 24 Aug 2015 14:02:24 -0700 Subject: [PATCH] In (strCommand == "tx"), return if AlreadyHave() The main effect is to exit processing for recently-rejected hashes, in case they are pushed to us without prior advertisement. This behavior was seen in the wild. An additional effect is to do early checks for mempool or mapOrphan existence. No logging or nDoS tracking is needed for failures of these checks. --- src/main.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index cb41afc96..1b4630787 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -4369,6 +4369,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, mapAlreadyAskedFor.erase(inv); + // Check for recently rejected (and do other quick existence checks) + if (AlreadyHave(inv)) + return true; + if (AcceptToMemoryPool(mempool, state, tx, true, &fMissingInputs)) { mempool.check(pcoinsTip); @@ -4444,13 +4448,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, if (nEvicted > 0) LogPrint("mempool", "mapOrphan overflow, removed %u tx\n", nEvicted); } else { - // AcceptToMemoryPool() returned false, possibly because the tx is - // already in the mempool; if the tx isn't in the mempool that - // means it was rejected and we shouldn't ask for it again. - if (!mempool.exists(tx.GetHash())) { - assert(recentRejects); - recentRejects->insert(tx.GetHash()); - } + assert(recentRejects); + recentRejects->insert(tx.GetHash()); + if (pfrom->fWhitelisted) { // Always relay transactions received from whitelisted peers, even // if they were rejected from the mempool, allowing the node to