aboutsummaryrefslogtreecommitdiff
path: root/src/chain.cpp
diff options
context:
space:
mode:
authorSuhas Daftuar <sdaftuar@gmail.com>2014-11-18 22:16:32 +0100
committerPieter Wuille <pieter.wuille@gmail.com>2015-11-29 11:59:23 +0100
commit50262d89531692473ff557c1061aee22aa4cca1c (patch)
treea9bcb626d8478da1293e1c11734cd0ac8776f62c /src/chain.cpp
parentc894fbbb1dc0778628fa3f246b92d673b3f70cfa (diff)
downloadbitcoin-50262d89531692473ff557c1061aee22aa4cca1c.tar.xz
Allow block announcements with headers
This replaces using inv messages to announce new blocks, when a peer requests (via the new "sendheaders" message) that blocks be announced with headers instead of inv's. Since headers-first was introduced, peers send getheaders messages in response to an inv, which requires generating a block locator that is large compared to the size of the header being requested, and requires an extra round-trip before a reorg can be relayed. Save time by tracking headers that a peer is likely to know about, and send a headers chain that would connect to a peer's known headers, unless the chain would be too big, in which case we revert to sending an inv instead. Based off of @sipa's commit to announce all blocks in a reorg via inv, which has been squashed into this commit. Rebased-by: Pieter Wuille
Diffstat (limited to 'src/chain.cpp')
-rw-r--r--src/chain.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/chain.cpp b/src/chain.cpp
index 5b8ce076c4..3450ed6c3f 100644
--- a/src/chain.cpp
+++ b/src/chain.cpp
@@ -51,6 +51,9 @@ CBlockLocator CChain::GetLocator(const CBlockIndex *pindex) const {
}
const CBlockIndex *CChain::FindFork(const CBlockIndex *pindex) const {
+ if (pindex == NULL) {
+ return NULL;
+ }
if (pindex->nHeight > Height())
pindex = pindex->GetAncestor(Height());
while (pindex && !Contains(pindex))