Browse Source

Don't hold cs_main when calling ProcessNewBlock from a cmpctblock

0.14
Matt Corallo 8 years ago
parent
commit
72ca7d924e
  1. 47
      src/main.cpp

47
src/main.cpp

@ -5787,29 +5787,34 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
BlockTransactions resp; BlockTransactions resp;
vRecv >> resp; vRecv >> resp;
LOCK(cs_main); CBlock block;
bool fBlockRead = false;
{
LOCK(cs_main);
map<uint256, pair<NodeId, list<QueuedBlock>::iterator> >::iterator it = mapBlocksInFlight.find(resp.blockhash); map<uint256, pair<NodeId, list<QueuedBlock>::iterator> >::iterator it = mapBlocksInFlight.find(resp.blockhash);
if (it == mapBlocksInFlight.end() || !it->second.second->partialBlock || if (it == mapBlocksInFlight.end() || !it->second.second->partialBlock ||
it->second.first != pfrom->GetId()) { it->second.first != pfrom->GetId()) {
LogPrint("net", "Peer %d sent us block transactions for block we weren't expecting\n", pfrom->id); LogPrint("net", "Peer %d sent us block transactions for block we weren't expecting\n", pfrom->id);
return true; return true;
} }
PartiallyDownloadedBlock& partialBlock = *it->second.second->partialBlock; PartiallyDownloadedBlock& partialBlock = *it->second.second->partialBlock;
CBlock block; ReadStatus status = partialBlock.FillBlock(block, resp.txn);
ReadStatus status = partialBlock.FillBlock(block, resp.txn); if (status == READ_STATUS_INVALID) {
if (status == READ_STATUS_INVALID) { MarkBlockAsReceived(resp.blockhash); // Reset in-flight state in case of whitelist
MarkBlockAsReceived(resp.blockhash); // Reset in-flight state in case of whitelist Misbehaving(pfrom->GetId(), 100);
Misbehaving(pfrom->GetId(), 100); LogPrintf("Peer %d sent us invalid compact block/non-matching block transactions\n", pfrom->id);
LogPrintf("Peer %d sent us invalid compact block/non-matching block transactions\n", pfrom->id); return true;
return true; } else if (status == READ_STATUS_FAILED) {
} else if (status == READ_STATUS_FAILED) { // Might have collided, fall back to getdata now :(
// Might have collided, fall back to getdata now :( std::vector<CInv> invs;
std::vector<CInv> invs; invs.push_back(CInv(MSG_BLOCK | GetFetchFlags(pfrom, chainActive.Tip(), chainparams.GetConsensus()), resp.blockhash));
invs.push_back(CInv(MSG_BLOCK | GetFetchFlags(pfrom, chainActive.Tip(), chainparams.GetConsensus()), resp.blockhash)); pfrom->PushMessage(NetMsgType::GETDATA, invs);
pfrom->PushMessage(NetMsgType::GETDATA, invs); } else
} else { fBlockRead = true;
} // Don't hold cs_main when we call into ProcessNewBlock
if (fBlockRead) {
CValidationState state; CValidationState state;
ProcessNewBlock(state, chainparams, pfrom, &block, false, NULL, &connman); ProcessNewBlock(state, chainparams, pfrom, &block, false, NULL, &connman);
int nDoS; int nDoS;

Loading…
Cancel
Save