diff options
author | luigi1111 <luigi1111w@gmail.com> | 2021-01-15 23:52:05 -0500 |
---|---|---|
committer | luigi1111 <luigi1111w@gmail.com> | 2021-01-15 23:52:05 -0500 |
commit | cb70ae9450b6887a046ef962abe73f3e64787ae2 (patch) | |
tree | a7a7036de2862522f461d415286a701f6de20db7 | |
parent | Merge pull request #7245 (diff) | |
parent | p2p: only log to global when a blocked IP is not already blocked (diff) | |
download | monero-cb70ae9450b6887a046ef962abe73f3e64787ae2.tar.xz |
Merge pull request #7260
c5c278c p2p: only log to global when a blocked IP is not already blocked (moneromooo-monero)
Diffstat (limited to '')
-rw-r--r-- | src/p2p/net_node.inl | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl index b8bd7b2a7..05af22a7f 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; } //----------------------------------------------------------------------------------- |