Merge pull request #6974

40b77d4 Always allow getheaders from whitelisted peers (Wladimir J. van der Laan)
bitcoin · Nov 11, 2015 · 2f71b07 · 2f71b07
2 parents c974306 + 40b77d4
commit 2f71b07
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -4317,10 +4317,10 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         vRecv >> locator >> hashStop;
 
         LOCK(cs_main);
-
-        if (IsInitialBlockDownload())
+        if (IsInitialBlockDownload() && !pfrom->fWhitelisted) {
+            LogPrint("net", "Ignoring getheaders from peer=%d because node is in initial block download\n", pfrom->id);
             return true;
-
+        }
         CBlockIndex* pindex = NULL;
         if (locator.IsNull())
         {