monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-23 20:19:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

cryptonote_protocol_handler.inl: remove span read just now that failed to pass some basic tests

Browse source
This commit is contained in:
stoffu 2018-04-28 11:10:59 +09:00
parent 409bf2d642
commit 16b2022991
No known key found for this signature in database
GPG key ID: 41DAB8343A9EC012
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/cryptonote_protocol/cryptonote_protocol_handler.inl
View file

@ -1008,6 +1008,7 @@ skip:
if (blocks.empty()) if (blocks.empty())
{ {
MERROR("Next span has no blocks"); MERROR("Next span has no blocks");
m_block_queue.remove_spans(span_connection_id, start_height);
break; break;
} }
@ -1015,6 +1016,7 @@ skip:
if (!parse_and_validate_block_from_blob(blocks.front().block, new_block)) if (!parse_and_validate_block_from_blob(blocks.front().block, new_block))
{ {
MERROR("Failed to parse block, but it should already have been parsed"); MERROR("Failed to parse block, but it should already have been parsed");
m_block_queue.remove_spans(span_connection_id, start_height);
break; break;
} }
bool parent_known = m_core.have_block(new_block.prev_id); bool parent_known = m_core.have_block(new_block.prev_id);
@ -1031,6 +1033,7 @@ skip:
// this can happen if a connection was sicced onto a late span, if it did not have those blocks, // this can happen if a connection was sicced onto a late span, if it did not have those blocks,
// since we don't know that at the sic time // since we don't know that at the sic time
LOG_ERROR_CCONTEXT("Got block with unknown parent which was not requested - querying block hashes"); LOG_ERROR_CCONTEXT("Got block with unknown parent which was not requested - querying block hashes");
m_block_queue.remove_spans(span_connection_id, start_height);
context.m_needed_objects.clear(); context.m_needed_objects.clear();
context.m_last_response_height = 0; context.m_last_response_height = 0;
goto skip; goto skip;