rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-26 12:53:27 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7332

Browse Source 
57edfd7 p2p: allow CIDR notation in DNS blocklist (moneromooo-monero)
This commit is contained in:
luigi1111 2021-03-30 12:03:56 -04:00
commit 39ce27b5d5
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/p2p/net_node.inl
View File

@ -2002,15 +2002,22 @@ namespace nodetool
{ {
if (ip.empty()) if (ip.empty())
continue; continue;
const expect<epee::net_utils::network_address> parsed_addr = net::get_network_address(ip, 0); auto subnet = net::get_ipv4_subnet_address(ip);
if (!parsed_addr) if (subnet)
{ {
MWARNING("Invalid IP address from DNS blocklist: " << ip << " - " << parsed_addr.error()); block_subnet(*subnet, DNS_BLOCKLIST_LIFETIME);
++bad; ++good;
continue; continue;
} }
block_host(*parsed_addr, DNS_BLOCKLIST_LIFETIME, true); const expect<epee::net_utils::network_address> parsed_addr = net::get_network_address(ip, 0);
++good; if (parsed_addr)
{
block_host(*parsed_addr, DNS_BLOCKLIST_LIFETIME, true);
++good;
continue;
}
MWARNING("Invalid IP address or subnet from DNS blocklist: " << ip << " - " << parsed_addr.error());
++bad;
} }
} }
if (good > 0) if (good > 0)