Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Tor tx proxy reconnect delays

This commit is contained in:
53a45b2637452980 2023-03-15 04:41:44 +00:00
parent 2d7a1921e4
commit 950b58ab0b
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/p2p/net_node.inl
View File

@ -1901,30 +1901,25 @@ namespace nodetool
conn_count = new_conn_count;
}
// extend when no connection is made, prevents immediate new connection after peer drop
if (get_outgoing_connections_count(zone.second) <= start_conn_count)
// max out connections set too high for available peers or connection issue
if (get_outgoing_connections_count(zone.second) <= start_conn_count && start_conn_count < zone.second.m_config.m_net_config.max_out_connection_count)
{
if (start_conn_count < zone.second.m_config.m_net_config.max_out_connection_count)
// add check if tor and not yet ready to connecct, if so avoid trying seeds.
MINFO("Failed to connect to any, trying seeds");
if (!connect_to_seed(zone.first))
{
// add check if tor and not yet ready to connecct, if so avoid trying seeds.
MINFO("Failed to connect to any, trying seeds");
if (!connect_to_seed(zone.first))
{
// maybe made connection
extend_make_next_connection_after(zone.first, true);
continue;
}
// maybe made connection
extend_make_next_connection_after(zone.first, true);
}
else
{
// usually maximum connections reached
// stop signal sent, extend as a precaution
extend_make_next_connection_after(zone.first, false);
continue;
}
}
// not always accurate when using seeds
// extend when no connection is made, prevents immediate new connection after peer drop
// acquire peers false because usually this will be max connections reached or set too high for available peers
// this will make a temporary connection issue worse
extend_make_next_connection_after(zone.first, false);
// this is really stop_signal_not_sent
one_succeeded = true;
}