Merge pull request #5942
fc72020
don't trickle for whitelisted nodes (Ruben de Vries)
This commit is contained in:
commit
6a1fbc4921
2 changed files with 7 additions and 2 deletions
|
@ -167,7 +167,12 @@ bool LoadBlockIndex();
|
||||||
void UnloadBlockIndex();
|
void UnloadBlockIndex();
|
||||||
/** Process protocol messages received from a given node */
|
/** Process protocol messages received from a given node */
|
||||||
bool ProcessMessages(CNode* pfrom);
|
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);
|
bool SendMessages(CNode* pto, bool fSendTrickle);
|
||||||
/** Run an instance of the script checking thread */
|
/** Run an instance of the script checking thread */
|
||||||
void ThreadScriptCheck();
|
void ThreadScriptCheck();
|
||||||
|
|
|
@ -1406,7 +1406,7 @@ void ThreadMessageHandler()
|
||||||
{
|
{
|
||||||
TRY_LOCK(pnode->cs_vSend, lockSend);
|
TRY_LOCK(pnode->cs_vSend, lockSend);
|
||||||
if (lockSend)
|
if (lockSend)
|
||||||
g_signals.SendMessages(pnode, pnode == pnodeTrickle);
|
g_signals.SendMessages(pnode, pnode == pnodeTrickle || pnode->fWhitelisted);
|
||||||
}
|
}
|
||||||
boost::this_thread::interruption_point();
|
boost::this_thread::interruption_point();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue