diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-07-29 08:20:57 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-07-29 08:21:03 +0200 |
| commit | 842bf8d2c5af86bc94e586d8acd5e5ab7c59ddc0 (patch) | |
| tree | eeccedf861303b058b2f42836c3255d15e5adcad /src | |
| parent | ad087638ee4864d6244ec9381ff764bfa6ee5086 (diff) | |
| parent | 1d06e49834814eed45e07393dcffd7b6683311b2 (diff) | |
| download | bitcoin-842bf8d2c5af86bc94e586d8acd5e5ab7c59ddc0.tar.xz | |
Merge #8408: Prevent fingerprinting, disk-DoS with compact blocks
1d06e49 Ignore CMPCTBLOCK messages for pruned blocks (Suhas Daftuar)
1de2a46 Ignore GETBLOCKTXN requests for unknown blocks (Suhas Daftuar)
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index 8dd703b687..f4e48b7065 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -5343,7 +5343,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, BlockMap::iterator it = mapBlockIndex.find(req.blockhash); if (it == mapBlockIndex.end() || !(it->second->nStatus & BLOCK_HAVE_DATA)) { - Misbehaving(pfrom->GetId(), 100); LogPrintf("Peer %d sent us a getblocktxn for a block we don't have", pfrom->id); return true; } @@ -5627,8 +5626,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, std::vector<CInv> vInv(1); vInv[0] = CInv(MSG_BLOCK, cmpctblock.header.GetHash()); pfrom->PushMessage(NetMsgType::GETDATA, vInv); - return true; } + return true; } // If we're not close to tip yet, give up and let parallel block fetch work its magic |