Merge pull request #7164: Do not download transactions during initial blockchain sync

39a525c Do not download transactions during inital sync (ptschip)
2016-01-19 12:57:56 +01:00
parent 668906fcf2 39a525c21f
commit 3b43cad9d0
4 changed files with 37 additions and 5 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4541,7 +4541,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
            {
                if (fBlocksOnly)
                    LogPrint("net", "transaction (%s) inv sent in violation of protocol peer=%d\n", inv.hash.ToString(), pfrom->id);
-                else if (!fAlreadyHave && !fImporting && !fReindex)
+                else if (!fAlreadyHave && !fImporting && !fReindex && !IsInitialBlockDownload())
                    pfrom->AskFor(inv);
            }