diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-11 18:30:11 +0100 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-11 18:30:17 +0100 |
commit | 2f71b07d5ed6ac74758e232136e997c94e3df8e6 (patch) | |
tree | 30f709ee7a4c5e1b8c12594eac252b2ccd314760 /src/main.cpp | |
parent | c9743062a37cd4ca2a7a0991b4d5e75517a9c34e (diff) | |
parent | 40b77d450dff6879c50a33d4e7f795c385fb0002 (diff) |
Merge pull request #6974
40b77d4 Always allow getheaders from whitelisted peers (Wladimir J. van der Laan)
Diffstat (limited to 'src/main.cpp')
-rw-r--r-- | src/main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp index 8eb8776558..f1a4527540 100644 --- 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()) { |