aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2023-03-09 17:17:59 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2023-03-09 17:17:59 +0000
commitd7a81ccba198e6ded296971c2ba4abcbb3ff7190 (patch)
treebffcb0d9d16c959a135f77531341d976f72aa447
parentp2p: avoid spam blocking ipv4 addresses in a blocked subnet (diff)
downloadmonero-d7a81ccba198e6ded296971c2ba4abcbb3ff7190.tar.xz
p2p: do not log to global when re-blocking a subnet
-rw-r--r--src/p2p/net_node.inl6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
index 70b8b176e..70396d369 100644
--- a/src/p2p/net_node.inl
+++ b/src/p2p/net_node.inl
@@ -333,6 +333,7 @@ namespace nodetool
limit = std::numeric_limits<time_t>::max();
else
limit = now + seconds;
+ const bool added = m_blocked_subnets.find(subnet) == m_blocked_subnets.end();
m_blocked_subnets[subnet] = limit;
// drop any connection to that subnet. This should only have to look into
@@ -365,7 +366,10 @@ namespace nodetool
conns.clear();
}
- MCLOG_CYAN(el::Level::Info, "global", "Subnet " << subnet.host_str() << " blocked.");
+ if (added)
+ MCLOG_CYAN(el::Level::Info, "global", "Subnet " << subnet.host_str() << " blocked.");
+ else
+ MINFO("Subnet " << subnet.host_str() << " blocked.");
return true;
}
//-----------------------------------------------------------------------------------