diff options
| author | Ruben de Vries <ruben@rubensayshi.com> | 2015-03-24 14:29:13 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-03-26 08:39:00 +0100 |
| commit | 78f64ef0b2c949496242bd97f403e3717b5f2fad (patch) | |
| tree | 644beedf3d3d412fa3077b528559f2a179570c50 | |
| parent | a316622fd012d36aa5885ecd938da671ae802ea2 (diff) | |
| download | bitcoin-78f64ef0b2c949496242bd97f403e3717b5f2fad.tar.xz | |
don't trickle for whitelisted nodes
Rebased-From: fc720207e0e513e531b1f266b966a2ffa57b936a
Github-Pull: #5942
| -rw-r--r-- | src/main.h | 7 | ||||
| -rw-r--r-- | src/net.cpp | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/main.h b/src/main.h index a62bebc49d..e4096e9612 100644 --- a/src/main.h +++ b/src/main.h @@ -179,7 +179,12 @@ bool LoadBlockIndex(); void UnloadBlockIndex(); /** Process protocol messages received from a given node */ bool ProcessMessages(CNode* pfrom); -/** Send queued protocol messages to be sent to a give node */ +/** + * Send queued protocol messages to be sent to a give node. + * + * @param[in] pto The node which we are sending messages to. + * @param[in] fSendTrickle When true send the trickled data, otherwise trickle the data until true. + */ bool SendMessages(CNode* pto, bool fSendTrickle); /** Run an instance of the script checking thread */ void ThreadScriptCheck(); diff --git a/src/net.cpp b/src/net.cpp index 7ed9d65fb2..1d95932ca6 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1456,7 +1456,7 @@ void ThreadMessageHandler() { TRY_LOCK(pnode->cs_vSend, lockSend); if (lockSend) - g_signals.SendMessages(pnode, pnode == pnodeTrickle); + g_signals.SendMessages(pnode, pnode == pnodeTrickle || pnode->fWhitelisted); } boost::this_thread::interruption_point(); } |