Re: [PATCH 10/12] rules.pl: Check if an ipset db file exists before call to restore it.

Reviewed-by: Michael Tremer michael.tremer@ipfire.org

On 14 Feb 2022, at 21:06, Peter Müller peter.mueller@ipfire.org wrote:

Reviewed-by: Peter Müller peter.mueller@ipfire.org

...

Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org

config/firewall/rules.pl | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl index 29990ee67..162781f7a 100644 --- a/config/firewall/rules.pl +++ b/config/firewall/rules.pl @@ -927,6 +927,12 @@ sub firewall_is_in_subnet { sub ipset_restore ($) { my ($ccode) = @_;

• # Run ipset and restore the list of the given country code.
• run("$IPSET restore < $Location::Functions::ipset_db_directory/$ccode.ipset4");

• my $file_prefix = "ipset4";
• my $db_file = "$Location::Functions::ipset_db_directory/$ccode.$file_prefix";
• # Check if the generated file exists.
• if (-f $db_file) {

• # Run ipset and restore the list of the given country code.
  

• run("$IPSET restore < $db_file");
  

• }

}