rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-12-24 14:17:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

p2p: remove obsolete local time from TIMED_SYNC

Browse source
This commit is contained in:
moneromooo-monero 2019-12-04 12:51:45 +00:00
parent 59e7d5686b
commit 5f98b46d58
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
3 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p2p/net_node.h
View file

@ -362,7 +362,7 @@ namespace nodetool
const boost::program_options::variables_map& vm const boost::program_options::variables_map& vm
); );
bool idle_worker(); bool idle_worker();
bool handle_remote_peerlist(const std::vector<peerlist_entry>& peerlist, time_t local_time, const epee::net_utils::connection_context_base& context); bool handle_remote_peerlist(const std::vector<peerlist_entry>& peerlist, const epee::net_utils::connection_context_base& context);
bool get_local_node_data(basic_node_data& node_data, const network_zone& zone); bool get_local_node_data(basic_node_data& node_data, const network_zone& zone);
//bool get_local_handshake_data(handshake_data& hshd); //bool get_local_handshake_data(handshake_data& hshd);

8
src/p2p/net_node.inl
View file

@ -1041,7 +1041,7 @@ namespace nodetool
return; return;
} }
if(!handle_remote_peerlist(rsp.local_peerlist_new, rsp.node_data.local_time, context)) if(!handle_remote_peerlist(rsp.local_peerlist_new, context))
{ {
LOG_WARNING_CC(context, "COMMAND_HANDSHAKE: failed to handle_remote_peerlist(...), closing connection."); LOG_WARNING_CC(context, "COMMAND_HANDSHAKE: failed to handle_remote_peerlist(...), closing connection.");
add_host_fail(context.m_remote_address); add_host_fail(context.m_remote_address);
@ -1119,7 +1119,7 @@ namespace nodetool
return; return;
} }
if(!handle_remote_peerlist(rsp.local_peerlist_new, rsp.local_time, context)) if(!handle_remote_peerlist(rsp.local_peerlist_new, context))
{ {
LOG_WARNING_CC(context, "COMMAND_TIMED_SYNC: failed to handle_remote_peerlist(...), closing connection."); LOG_WARNING_CC(context, "COMMAND_TIMED_SYNC: failed to handle_remote_peerlist(...), closing connection.");
m_network_zones.at(context.m_remote_address.get_zone()).m_net_server.get_config_object().close(context.m_connection_id ); m_network_zones.at(context.m_remote_address.get_zone()).m_net_server.get_config_object().close(context.m_connection_id );
@ -1894,7 +1894,7 @@ namespace nodetool
} }
//----------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------
template<class t_payload_net_handler> template<class t_payload_net_handler>
bool node_server<t_payload_net_handler>::handle_remote_peerlist(const std::vector<peerlist_entry>& peerlist, time_t local_time, const epee::net_utils::connection_context_base& context) bool node_server<t_payload_net_handler>::handle_remote_peerlist(const std::vector<peerlist_entry>& peerlist, const epee::net_utils::connection_context_base& context)
{ {
std::vector<peerlist_entry> peerlist_ = peerlist; std::vector<peerlist_entry> peerlist_ = peerlist;
if(!sanitize_peerlist(peerlist_)) if(!sanitize_peerlist(peerlist_))
@ -2291,8 +2291,6 @@ namespace nodetool
} }
//fill response //fill response
rsp.local_time = time(NULL);
const epee::net_utils::zone zone_type = context.m_remote_address.get_zone(); const epee::net_utils::zone zone_type = context.m_remote_address.get_zone();
network_zone& zone = m_network_zones.at(zone_type); network_zone& zone = m_network_zones.at(zone_type);

2
src/p2p/p2p_protocol_defs.h
View file

@ -268,12 +268,10 @@ namespace nodetool
struct response_t struct response_t
{ {
uint64_t local_time;
t_playload_type payload_data; t_playload_type payload_data;
std::vector<peerlist_entry> local_peerlist_new; std::vector<peerlist_entry> local_peerlist_new;
BEGIN_KV_SERIALIZE_MAP() BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE(local_time)
KV_SERIALIZE(payload_data) KV_SERIALIZE(payload_data)
if (is_store) if (is_store)
{ {