Merge pull request #2267

e49f6d43 net_node: fix m_in_timedsync initialization (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-08-09 09:21:22 +02:00
commit b3d595582a
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 2 additions and 1 deletions

View File

@ -61,7 +61,7 @@ namespace nodetool
template<class base_type> template<class base_type>
struct p2p_connection_context_t: base_type //t_payload_net_handler::connection_context //public net_utils::connection_context_base struct p2p_connection_context_t: base_type //t_payload_net_handler::connection_context //public net_utils::connection_context_base
{ {
p2p_connection_context_t(): support_flags(0), m_in_timedsync(false) {} p2p_connection_context_t(): peer_id(0), support_flags(0), m_in_timedsync(false) {}
peerid_type peer_id; peerid_type peer_id;
uint32_t support_flags; uint32_t support_flags;

View File

@ -1678,6 +1678,7 @@ namespace nodetool
//associate peer_id with this connection //associate peer_id with this connection
context.peer_id = arg.node_data.peer_id; context.peer_id = arg.node_data.peer_id;
context.m_in_timedsync = false;
if(arg.node_data.peer_id != m_config.m_peer_id && arg.node_data.my_port) if(arg.node_data.peer_id != m_config.m_peer_id && arg.node_data.my_port)
{ {