don't trickle for whitelisted nodes

rubensayshi · laanwj · commit 78f64ef0b2c9 · 2015-03-26T08:39:00.000+01:00
Rebased-From: fc72020 Github-Pull: bitcoin#5942
diff --git 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
@@ -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();
         }

Original file line number	Diff line number	Diff line change
`@@ -1456,7 +1456,7 @@ void ThreadMessageHandler()`
`1456`	`1456`	`{`
`1457`	`1457`	`TRY_LOCK(pnode->cs_vSend, lockSend);`
`1458`	`1458`	`if (lockSend)`
`1459`		`- g_signals.SendMessages(pnode, pnode == pnodeTrickle);`
	`1459`	`+ g_signals.SendMessages(pnode, pnode == pnodeTrickle \|\| pnode->fWhitelisted);`
`1460`	`1460`	`}`
`1461`	`1461`	`boost::this_thread::interruption_point();`
`1462`	`1462`	`}`