Merge pull request #5942

fc72020 don't trickle for whitelisted nodes (Ruben de Vries)

2 files changed, 7 insertions, 2 deletions

diff --git a/src/main.h b/src/main.h
index 09ffc4d28b..ac73b242f1 100644
--- a/src/main.h
+++ b/src/main.h
@@ -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();
diff --git a/src/net.cpp b/src/net.cpp
index 0723ee218a..11c2cd07d9 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -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();
         }