Merge pull request #7180

56748e1d7 ban lists may now include subnets (moneromooo-monero)

1 files changed, 9 insertions, 3 deletions

diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
index 6016b243f..bf053f0f2 100644
--- a/src/p2p/net_node.inl
+++ b/src/p2p/net_node.inl
@@ -489,13 +489,19 @@ namespace nodetool
       std::istringstream iss(banned_ips);
       for (std::string line; std::getline(iss, line); )
       {
+        auto subnet = net::get_ipv4_subnet_address(line);
+        if (subnet)
+        {
+          block_subnet(*subnet, std::numeric_limits<time_t>::max());
+          continue;
+        }
         const expect<epee::net_utils::network_address> parsed_addr = net::get_network_address(line, 0);
-        if (!parsed_addr)
+        if (parsed_addr)
         {
-          MERROR("Invalid IP address: " << line << " - " << parsed_addr.error());
+          block_host(*parsed_addr, std::numeric_limits<time_t>::max());
           continue;
         }
-        block_host(*parsed_addr, std::numeric_limits<time_t>::max());
+        MERROR("Invalid IP address or IPv4 subnet: " << line);
       }
     }