From: Stefan Schantl Date: Fri, 14 Apr 2023 17:09:46 +0000 (+0200) Subject: rules.pl: Drop old code to load a blocklist X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=94fb78a5e1c50bbb9a6f2db4e31cd3bafb883c4f;p=people%2Fstevee%2Fipfire-2.x.git rules.pl: Drop old code to load a blocklist Signed-off-by: Stefan Schantl --- diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl index 0916ec207e..932268341a 100644 --- a/config/firewall/rules.pl +++ b/config/firewall/rules.pl @@ -1070,26 +1070,6 @@ sub ipset_restore ($) { # If the set is not loaded, we have to rename it to proper use it. run("$IPSET rename $loc_set $set"); } - - # Check if the given set name is a blocklist. - } elsif ($set ~~ @blocklists) { - # IPblocklist sets contains v4 as setname extension. - my $set_name = "$set" . "v4"; - - # Get the database file for the given blocklist. - my $db_file = &IPblocklist::get_ipset_db_file($set); - - # Call function to restore/load the set. - &ipset_call_restore($db_file); - - # Check if the set is already loaded (has been used before). - if ($set ~~ @ipset_used_sets) { - # Swap the sets. - run("$IPSET swap $set_name $set"); - } else { - # Rename the set to proper use it. - run("$IPSET rename $set_name $set"); - } } }