nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4776

Browse Source 
03fc731b p2p: less frequent incoming connections check (moneromooo-monero)
14a5c206 p2p: tone down "no incoming connections" warning to info if in peers is 0 (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-11-16 11:01:19 +02:00
commit 46d0dc2808
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/p2p/net_node.h
View File

@ -308,7 +308,7 @@ namespace nodetool
epee::math_helper::once_a_time_seconds<1> m_connections_maker_interval; epee::math_helper::once_a_time_seconds<1> m_connections_maker_interval;
epee::math_helper::once_a_time_seconds<60*30, false> m_peerlist_store_interval; epee::math_helper::once_a_time_seconds<60*30, false> m_peerlist_store_interval;
epee::math_helper::once_a_time_seconds<60> m_gray_peerlist_housekeeping_interval; epee::math_helper::once_a_time_seconds<60> m_gray_peerlist_housekeeping_interval;
epee::math_helper::once_a_time_seconds<900, false> m_incoming_connections_interval; epee::math_helper::once_a_time_seconds<3600, false> m_incoming_connections_interval;
std::string m_bind_ip; std::string m_bind_ip;
std::string m_port; std::string m_port;

13
src/p2p/net_node.inl
View File

@ -1334,12 +1334,19 @@ namespace nodetool
template<class t_payload_net_handler> template<class t_payload_net_handler>
bool node_server<t_payload_net_handler>::check_incoming_connections() bool node_server<t_payload_net_handler>::check_incoming_connections()
{ {
if (m_offline || m_hide_my_port) if (m_offline)
return true; return true;
if (get_incoming_connections_count() == 0) if (get_incoming_connections_count() == 0)
{ {
const el::Level level = el::Level::Warning; if (m_hide_my_port || m_config.m_net_config.max_in_connection_count == 0)
MCLOG_RED(level, "global", "No incoming connections - check firewalls/routers allow port " << get_this_peer_port()); {
MGINFO("Incoming connections disabled, enable them for full connectivity");
}
else
{
const el::Level level = el::Level::Warning;
MCLOG_RED(level, "global", "No incoming connections - check firewalls/routers allow port " << get_this_peer_port());
}
} }
return true; return true;
} }