nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

p2p: avoid spam blocking ipv4 addresses in a blocked subnet

Browse Source
This commit is contained in:
moneromooo-monero 2023-03-01 16:56:17 +00:00
parent 549a4b424a
commit d84a0d7430
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/p2p/net_node.inl
View File

@ -247,7 +247,23 @@ namespace nodetool
if (it == m_blocked_hosts.end()) if (it == m_blocked_hosts.end())
{ {
m_blocked_hosts[host_str] = limit; m_blocked_hosts[host_str] = limit;
added = true;
// if the host was already blocked due to being in a blocked subnet, let it be silent
bool matches_blocked_subnet = false;
if (addr.get_type_id() == epee::net_utils::address_type::ipv4)
{
auto ipv4_address = addr.template as<epee::net_utils::ipv4_network_address>();
for (auto jt = m_blocked_subnets.begin(); jt != m_blocked_subnets.end(); ++jt)
{
if (jt->first.matches(ipv4_address))
{
matches_blocked_subnet = true;
break;
}
}
}
if (!matches_blocked_subnet)
added = true;
} }
else if (it->second < limit || !add_only) else if (it->second < limit || !add_only)
it->second = limit; it->second = limit;