From eff2e08302c3c084983f045038bc1708dc6b570a Mon Sep 17 00:00:00 2001 From: CryptoManiac Date: Thu, 31 Mar 2016 20:18:13 +0300 Subject: [PATCH] Get rid of fTrickle parameter. --- src/main.h | 2 +- src/net.cpp | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main.h b/src/main.h index 63884b2..64e0f0f 100644 --- a/src/main.h +++ b/src/main.h @@ -113,7 +113,7 @@ bool LoadBlockIndex(bool fAllowNew=true); void PrintBlockTree(); CBlockIndex* FindBlockByHeight(int nHeight); bool ProcessMessages(CNode* pfrom); -bool SendMessages(CNode* pto, bool fSendTrickle); +bool SendMessages(CNode* pto); bool LoadExternalBlockFile(FILE* fileIn); // Run an instance of the script checking thread diff --git a/src/net.cpp b/src/net.cpp index 5dcf9fc..af5e01a 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1517,9 +1517,6 @@ void ThreadMessageHandler2(void* parg) StartSync(vNodesCopy); // Poll the connected nodes for messages - CNode* pnodeTrickle = NULL; - if (!vNodesCopy.empty()) - pnodeTrickle = vNodesCopy[GetRand(vNodesCopy.size())]; BOOST_FOREACH(CNode* pnode, vNodesCopy) { // Receive messages @@ -1535,7 +1532,7 @@ void ThreadMessageHandler2(void* parg) { TRY_LOCK(pnode->cs_vSend, lockSend); if (lockSend) - SendMessages(pnode, pnode == pnodeTrickle); + SendMessages(pnode); } if (fShutdown) return; -- 1.7.1