Merge #8408: Prevent fingerprinting, disk-DoS with compact blocks

laanwj · laanwj · commit 842bf8d2c5af · 2016-07-29T08:21:03.000+02:00
1d06e49 Ignore CMPCTBLOCK messages for pruned blocks (Suhas Daftuar) 1de2a46 Ignore GETBLOCKTXN requests for unknown blocks (Suhas Daftuar)
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -5343,7 +5343,6 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,`
`5343`	`5343`
`5344`	`5344`	`BlockMap::iterator it = mapBlockIndex.find(req.blockhash);`
`5345`	`5345`	`if (it == mapBlockIndex.end() \|\| !(it->second->nStatus & BLOCK_HAVE_DATA)) {`
`5346`		`- Misbehaving(pfrom->GetId(), 100);`
`5347`	`5346`	`LogPrintf("Peer %d sent us a getblocktxn for a block we don't have", pfrom->id);`
`5348`	`5347`	`return true;`
`5349`	`5348`	`}`
`@@ -5627,8 +5626,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,`
`5627`	`5626`	`std::vector<CInv> vInv(1);`
`5628`	`5627`	`vInv[0] = CInv(MSG_BLOCK, cmpctblock.header.GetHash());`
`5629`	`5628`	`pfrom->PushMessage(NetMsgType::GETDATA, vInv);`
`5630`		`- return true;`
`5631`	`5629`	`}`
	`5630`	`+ return true;`
`5632`	`5631`	`}`
`5633`	`5632`
`5634`	`5633`	`// If we're not close to tip yet, give up and let parallel block fetch work its magic`