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

daemon: print peers' top height in sync_info

Browse source
This commit is contained in:
moneromooo-monero 2017-08-12 10:59:54 +01:00
parent 08abb670e1
commit 2ec15a6931
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/cryptonote_protocol/cryptonote_protocol_defs.h
View file

@ -76,6 +76,8 @@ namespace cryptonote
boost::uuids::uuid connection_id; boost::uuids::uuid connection_id;
uint64_t height;
BEGIN_KV_SERIALIZE_MAP() BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE(incoming) KV_SERIALIZE(incoming)
KV_SERIALIZE(localhost) KV_SERIALIZE(localhost)
@ -97,6 +99,7 @@ namespace cryptonote
KV_SERIALIZE(current_upload) KV_SERIALIZE(current_upload)
KV_SERIALIZE(support_flags) KV_SERIALIZE(support_flags)
KV_SERIALIZE_VAL_POD_AS_BLOB(connection_id) KV_SERIALIZE_VAL_POD_AS_BLOB(connection_id)
KV_SERIALIZE(height)
END_KV_SERIALIZE_MAP() END_KV_SERIALIZE_MAP()
}; };

5
src/cryptonote_protocol/cryptonote_protocol_handler.inl
View file

@ -239,6 +239,8 @@ namespace cryptonote
cnx.connection_id = cntxt.m_connection_id; cnx.connection_id = cntxt.m_connection_id;
cnx.height = cntxt.m_remote_blockchain_height;
connections.push_back(cnx); connections.push_back(cnx);
return true; return true;
@ -264,6 +266,8 @@ namespace cryptonote
return false; return false;
} }
context.m_remote_blockchain_height = hshd.current_height;
uint64_t target = m_core.get_target_blockchain_height(); uint64_t target = m_core.get_target_blockchain_height();
if (target == 0) if (target == 0)
target = m_core.get_current_blockchain_height(); target = m_core.get_current_blockchain_height();
@ -293,7 +297,6 @@ namespace cryptonote
} }
LOG_PRINT_L1("Remote blockchain height: " << hshd.current_height << ", id: " << hshd.top_id); LOG_PRINT_L1("Remote blockchain height: " << hshd.current_height << ", id: " << hshd.top_id);
context.m_state = cryptonote_connection_context::state_synchronizing; context.m_state = cryptonote_connection_context::state_synchronizing;
context.m_remote_blockchain_height = hshd.current_height;
//let the socket to send response to handshake, but request callback, to let send request data after response //let the socket to send response to handshake, but request callback, to let send request data after response
LOG_PRINT_CCONTEXT_L2("requesting callback"); LOG_PRINT_CCONTEXT_L2("requesting callback");
++context.m_callback_request_count; ++context.m_callback_request_count;

2
src/daemon/rpc_command_executor.cpp
View file

@ -1742,7 +1742,7 @@ bool t_rpc_command_executor::sync_info()
for (const auto &s: res.spans) for (const auto &s: res.spans)
if (s.rate > 0.0f && s.connection_id == p.info.connection_id) if (s.rate > 0.0f && s.connection_id == p.info.connection_id)
nblocks += s.nblocks, size += s.size; nblocks += s.nblocks, size += s.size;
tools::success_msg_writer() << address << " " << p.info.peer_id << " " << p.info.current_download << " kB/s, " << nblocks << " blocks / " << size/1e6 << " MB queued"; tools::success_msg_writer() << address << " " << p.info.peer_id << " " << p.info.height << " " << p.info.current_download << " kB/s, " << nblocks << " blocks / " << size/1e6 << " MB queued";
} }
uint64_t total_size = 0; uint64_t total_size = 0;