monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-22 19:49:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7260

Browse source 
c5c278c p2p: only log to global when a blocked IP is not already blocked (moneromooo-monero)
This commit is contained in:
luigi1111 2021-01-15 23:52:05 -05:00
commit cb70ae9450
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/p2p/net_node.inl
View file

@ -234,6 +234,7 @@ namespace nodetool
return false;
const time_t now = time(nullptr);
bool added = false;
CRITICAL_REGION_LOCAL(m_blocked_hosts_lock);
time_t limit;
@ -244,7 +245,10 @@ namespace nodetool
const std::string host_str = addr.host_str();
auto it = m_blocked_hosts.find(host_str);
if (it == m_blocked_hosts.end())
{
m_blocked_hosts[host_str] = limit;
added = true;
}
else if (it->second < limit || !add_only)
it->second = limit;
@ -275,7 +279,10 @@ namespace nodetool
conns.clear();
}
MCLOG_CYAN(el::Level::Info, "global", "Host " << host_str << " blocked.");
if (added)
MCLOG_CYAN(el::Level::Info, "global", "Host " << host_str << " blocked.");
else
MINFO("Host " << host_str << " block time updated.");
return true;
}
//-----------------------------------------------------------------------------------