Merge pull request #5942

fc72020 don't trickle for whitelisted nodes (Ruben de Vries)
This commit is contained in:
Wladimir J. van der Laan 2015-03-26 08:32:53 +01:00
commit 6a1fbc4921
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
2 changed files with 7 additions and 2 deletions

View file

@ -167,7 +167,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();

View file

@ -1406,7 +1406,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();
}