LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge #8968: Don't hold cs_main when calling ProcessNewBlock from a cmpctblock

Browse source 
72ca7d9 Don't hold cs_main when calling ProcessNewBlock from a cmpctblock (Matt Corallo)
This commit is contained in:
Wladimir J. van der Laan 2016-10-21 16:58:20 +02:00
commit 3cf496d102
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
1 changed files with 27 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/main.cpp
View file

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