aboutsummaryrefslogtreecommitdiff
path: root/src/cryptonote_protocol/cryptonote_protocol_handler.inl
diff options
context:
space:
mode:
authorHoward Chu <hyc@symas.com>2017-02-15 06:38:38 -0800
committerHoward Chu <hyc@symas.com>2017-02-15 14:41:42 +0000
commit424b76a4e55d6ad631349f5b4763d3a9237a01ed (patch)
treeb1d588be7f74d06e619f5633b0e984132a820375 /src/cryptonote_protocol/cryptonote_protocol_handler.inl
parentMerge pull request #1719 (diff)
downloadmonero-424b76a4e55d6ad631349f5b4763d3a9237a01ed.tar.xz
Fix spurious synchronization status msgs
Only update target height if it's actually greater than the current target. Only display "synchronized" when current height equals target.
Diffstat (limited to '')
-rw-r--r--src/cryptonote_protocol/cryptonote_protocol_handler.inl6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/cryptonote_protocol/cryptonote_protocol_handler.inl b/src/cryptonote_protocol/cryptonote_protocol_handler.inl
index 72940d36a..0d3158eaf 100644
--- a/src/cryptonote_protocol/cryptonote_protocol_handler.inl
+++ b/src/cryptonote_protocol/cryptonote_protocol_handler.inl
@@ -265,14 +265,17 @@ namespace cryptonote
if(context.m_state == cryptonote_connection_context::state_synchronizing)
return true;
+ uint64_t target = m_core.get_target_blockchain_height();
if(m_core.have_block(hshd.top_id))
{
context.m_state = cryptonote_connection_context::state_normal;
- if(is_inital)
+ if(is_inital && target == m_core.get_current_blockchain_height())
on_connection_synchronized();
return true;
}
+ if (hshd.current_height > target)
+ {
/* As I don't know if accessing hshd from core could be a good practice,
I prefer pushing target height to the core at the same time it is pushed to the user.
Nz. */
@@ -286,6 +289,7 @@ namespace cryptonote
<< " [Your node is " << std::abs(diff) << " blocks (" << ((abs(diff) - diff_v2) / (24 * 60 * 60 / DIFFICULTY_TARGET_V1)) + (diff_v2 / (24 * 60 * 60 / DIFFICULTY_TARGET_V2)) << " days) "
<< (0 <= diff ? std::string("behind") : std::string("ahead"))
<< "] " << ENDL << "SYNCHRONIZATION started");
+ }
LOG_PRINT_L1("Remote blockchain height: " << hshd.current_height << ", id: " << hshd.top_id);
context.m_state = cryptonote_connection_context::state_synchronizing;
context.m_remote_blockchain_height = hshd.current_height;