Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7266 

38a6e6e protocol: handle receiving a block hash we've not added yet (moneromooo-monero)
This commit is contained in:
luigi1111 2021-01-06 21:09:03 -05:00
parent dbaf95ac77 38a6e6eb26
commit 69e4a2c62d
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/cryptonote_protocol/cryptonote_protocol_handler.inl
View File

@ -2593,12 +2593,17 @@ skip:
} }
int where; int where;
const bool have_block = m_core.have_block_unlocked(arg.m_block_ids[i], &where); const bool have_block = m_core.have_block_unlocked(arg.m_block_ids[i], &where);
if (first && !have_block) if (first)
{
if (!have_block && !m_block_queue.requested(arg.m_block_ids[i]) && !m_block_queue.have(arg.m_block_ids[i]))
{ {
LOG_ERROR_CCONTEXT("First block hash is unknown, dropping connection"); LOG_ERROR_CCONTEXT("First block hash is unknown, dropping connection");
drop_connection_with_score(context, 5, false); drop_connection_with_score(context, 5, false);
return 1; return 1;
} }
if (!have_block)
expect_unknown = true;
}
if (!first) if (!first)
{ {
// after the first, blocks may be known or unknown, but if they are known, // after the first, blocks may be known or unknown, but if they are known,