Merge #15597: net: Generate log entry when blocks messages are received unexpectedly
ef0019e054
Generate log entry when blocks messages are received unexpectedly. (Patrick Strateman)
Pull request description:
Currently these are incorrectly logged as an unknown command.
Tree-SHA512: dd272388a90b79897f8c1ea6d4c949323fcf75493f3a5b2ec9a26a2cf6a8ee743b497941702f21df8fae0f5b9481444363643379832dbd5053b0cc0b0363de04
This commit is contained in:
commit
b3f82284ba
|
@ -2541,8 +2541,14 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (strCommand == NetMsgType::CMPCTBLOCK && !fImporting && !fReindex) // Ignore blocks received while importing
|
if (strCommand == NetMsgType::CMPCTBLOCK)
|
||||||
{
|
{
|
||||||
|
// Ignore cmpctblock received while importing
|
||||||
|
if (fImporting || fReindex) {
|
||||||
|
LogPrint(BCLog::NET, "Unexpected cmpctblock message received from peer %d\n", pfrom->GetId());
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
CBlockHeaderAndShortTxIDs cmpctblock;
|
CBlockHeaderAndShortTxIDs cmpctblock;
|
||||||
vRecv >> cmpctblock;
|
vRecv >> cmpctblock;
|
||||||
|
|
||||||
|
@ -2762,8 +2768,14 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (strCommand == NetMsgType::BLOCKTXN && !fImporting && !fReindex) // Ignore blocks received while importing
|
if (strCommand == NetMsgType::BLOCKTXN)
|
||||||
{
|
{
|
||||||
|
// Ignore blocktxn received while importing
|
||||||
|
if (fImporting || fReindex) {
|
||||||
|
LogPrint(BCLog::NET, "Unexpected blocktxn message received from peer %d\n", pfrom->GetId());
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
BlockTransactions resp;
|
BlockTransactions resp;
|
||||||
vRecv >> resp;
|
vRecv >> resp;
|
||||||
|
|
||||||
|
@ -2837,8 +2849,14 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (strCommand == NetMsgType::HEADERS && !fImporting && !fReindex) // Ignore headers received while importing
|
if (strCommand == NetMsgType::HEADERS)
|
||||||
{
|
{
|
||||||
|
// Ignore headers received while importing
|
||||||
|
if (fImporting || fReindex) {
|
||||||
|
LogPrint(BCLog::NET, "Unexpected headers message received from peer %d\n", pfrom->GetId());
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
std::vector<CBlockHeader> headers;
|
std::vector<CBlockHeader> headers;
|
||||||
|
|
||||||
// Bypass the normal CBlock deserialization, as we don't want to risk deserializing 2000 full blocks.
|
// Bypass the normal CBlock deserialization, as we don't want to risk deserializing 2000 full blocks.
|
||||||
|
@ -2862,8 +2880,14 @@ bool static ProcessMessage(CNode* pfrom, const std::string& strCommand, CDataStr
|
||||||
return ProcessHeadersMessage(pfrom, connman, headers, chainparams, should_punish);
|
return ProcessHeadersMessage(pfrom, connman, headers, chainparams, should_punish);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (strCommand == NetMsgType::BLOCK && !fImporting && !fReindex) // Ignore blocks received while importing
|
if (strCommand == NetMsgType::BLOCK)
|
||||||
{
|
{
|
||||||
|
// Ignore block received while importing
|
||||||
|
if (fImporting || fReindex) {
|
||||||
|
LogPrint(BCLog::NET, "Unexpected block message received from peer %d\n", pfrom->GetId());
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
std::shared_ptr<CBlock> pblock = std::make_shared<CBlock>();
|
std::shared_ptr<CBlock> pblock = std::make_shared<CBlock>();
|
||||||
vRecv >> *pblock;
|
vRecv >> *pblock;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue