From 5c88e3c108f8bbe0edbcd88b3f48e3eaf611cd7c Mon Sep 17 00:00:00 2001 From: Pieter Wuille Date: Tue, 21 Aug 2012 19:18:53 +0200 Subject: [PATCH] Do not accept orphan blocks in -loadblock mode --- src/main.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 7dd59fdea..91aba149b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1920,17 +1920,20 @@ bool ProcessBlock(CNode* pfrom, CBlock* pblock) } - // If don't already have its previous block, shunt it off to holding area until we get it + // If we don't already have its previous block, shunt it off to holding area until we get it if (!mapBlockIndex.count(pblock->hashPrevBlock)) { printf("ProcessBlock: ORPHAN BLOCK, prev=%s\n", pblock->hashPrevBlock.ToString().substr(0,20).c_str()); - CBlock* pblock2 = new CBlock(*pblock); - mapOrphanBlocks.insert(make_pair(hash, pblock2)); - mapOrphanBlocksByPrev.insert(make_pair(pblock2->hashPrevBlock, pblock2)); - // Ask this guy to fill in what we're missing - if (pfrom) + // Accept orphans as long as there is a node to request its parents from + if (pfrom) { + CBlock* pblock2 = new CBlock(*pblock); + mapOrphanBlocks.insert(make_pair(hash, pblock2)); + mapOrphanBlocksByPrev.insert(make_pair(pblock2->hashPrevBlock, pblock2)); + + // Ask this guy to fill in what we're missing pfrom->PushGetBlocks(pindexBest, GetOrphanRoot(pblock2)); + } return true; }