aboutsummaryrefslogtreecommitdiff
path: root/src/p2p/net_node.inl
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2021-01-15 23:53:40 -0500
committerluigi1111 <luigi1111w@gmail.com>2021-01-15 23:53:40 -0500
commit25670398b11b3c4b6a55a9d410fa67debb59eb68 (patch)
tree25daa0d82ff90545a43d12afbb94381020687026 /src/p2p/net_node.inl
parentMerge pull request #7292 (diff)
parentp2p: only log to global when a blocked IP is not already blocked (diff)
downloadmonero-25670398b11b3c4b6a55a9d410fa67debb59eb68.tar.xz
Merge pull request #7295
fe6dda9 p2p: only log to global when a blocked IP is not already blocked (moneromooo-monero)
Diffstat (limited to 'src/p2p/net_node.inl')
-rw-r--r--src/p2p/net_node.inl9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
index 2387e3bff..f630a80b2 100644
--- a/src/p2p/net_node.inl
+++ b/src/p2p/net_node.inl
@@ -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;
}
//-----------------------------------------------------------------------------------