monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-17 16:27:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #984

Browse source 
78035d2 Fix fake 'network synchronized, begin using' messages (Thomas Winget)
This commit is contained in:
Riccardo Spagni 2016-08-26 10:33:10 +02:00
commit 2702e4999a
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/cryptonote_core/cryptonote_core.cpp
View file

@ -957,7 +957,10 @@ namespace cryptonote
//----------------------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------------------
void core::set_target_blockchain_height(uint64_t target_blockchain_height) void core::set_target_blockchain_height(uint64_t target_blockchain_height)
{ {
m_target_blockchain_height = target_blockchain_height; if (target_blockchain_height > m_target_blockchain_height)
{
m_target_blockchain_height = target_blockchain_height;
}
} }
//----------------------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------------------
uint64_t core::get_target_blockchain_height() const uint64_t core::get_target_blockchain_height() const

2
src/cryptonote_protocol/cryptonote_protocol_handler.inl
View file

@ -263,7 +263,7 @@ namespace cryptonote
if(context.m_state == cryptonote_connection_context::state_synchronizing) if(context.m_state == cryptonote_connection_context::state_synchronizing)
return true; return true;
if(m_core.have_block(hshd.top_id)) if(m_core.have_block(hshd.top_id) && !(hshd.current_height < m_core.get_target_blockchain_height()))
{ {
context.m_state = cryptonote_connection_context::state_normal; context.m_state = cryptonote_connection_context::state_normal;
if(is_inital) if(is_inital)