monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-18 10:01:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename m_listenning_port to m_listening_port

Browse source
This commit is contained in:
MaxXor 2017-09-01 09:50:22 +02:00
parent a1ea475fff
commit e3680b6936
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p2p/net_node.h
View file

@ -105,7 +105,7 @@ namespace nodetool
bool init(const boost::program_options::variables_map& vm); bool init(const boost::program_options::variables_map& vm);
bool deinit(); bool deinit();
bool send_stop_signal(); bool send_stop_signal();
uint32_t get_this_peer_port(){return m_listenning_port;} uint32_t get_this_peer_port(){return m_listening_port;}
t_payload_net_handler& get_payload_object(); t_payload_net_handler& get_payload_object();
template <class Archive, class t_version_type> template <class Archive, class t_version_type>
@ -289,7 +289,7 @@ namespace nodetool
bool m_have_address; bool m_have_address;
bool m_first_connection_maker_call; bool m_first_connection_maker_call;
uint32_t m_listenning_port; uint32_t m_listening_port;
uint32_t m_external_port; uint32_t m_external_port;
uint32_t m_ip_address; uint32_t m_ip_address;
bool m_allow_local_ip; bool m_allow_local_ip;

10
src/p2p/net_node.inl
View file

@ -573,14 +573,14 @@ namespace nodetool
res = m_net_server.init_server(m_port, m_bind_ip); res = m_net_server.init_server(m_port, m_bind_ip);
CHECK_AND_ASSERT_MES(res, false, "Failed to bind server"); CHECK_AND_ASSERT_MES(res, false, "Failed to bind server");
m_listenning_port = m_net_server.get_binded_port(); m_listening_port = m_net_server.get_binded_port();
MLOG_GREEN(el::Level::Info, "Net service bound to " << m_bind_ip << ":" << m_listenning_port); MLOG_GREEN(el::Level::Info, "Net service bound to " << m_bind_ip << ":" << m_listening_port);
if(m_external_port) if(m_external_port)
MDEBUG("External port defined as " << m_external_port); MDEBUG("External port defined as " << m_external_port);
// add UPnP port mapping // add UPnP port mapping
if(!m_no_igd) if(!m_no_igd)
add_upnp_port_mapping(m_listenning_port); add_upnp_port_mapping(m_listening_port);
return res; return res;
} }
@ -650,7 +650,7 @@ namespace nodetool
m_net_server.deinit_server(); m_net_server.deinit_server();
// remove UPnP port mapping // remove UPnP port mapping
if(!m_no_igd) if(!m_no_igd)
delete_upnp_port_mapping(m_listenning_port); delete_upnp_port_mapping(m_listening_port);
return store_config(); return store_config();
} }
//----------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------
@ -1352,7 +1352,7 @@ namespace nodetool
node_data.local_time = local_time; node_data.local_time = local_time;
node_data.peer_id = m_config.m_peer_id; node_data.peer_id = m_config.m_peer_id;
if(!m_hide_my_port) if(!m_hide_my_port)
node_data.my_port = m_external_port ? m_external_port : m_listenning_port; node_data.my_port = m_external_port ? m_external_port : m_listening_port;
else else
node_data.my_port = 0; node_data.my_port = 0;
node_data.network_id = m_network_id; node_data.network_id = m_network_id;