From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH 10/12] rules.pl: Check if an ipset db file exists before
 call to restore it.
Date: Tue, 15 Feb 2022 12:38:02 +0000
Message-ID: <927E1FCA-0687-45E7-B8C6-42B01377B186@ipfire.org>
In-Reply-To: <05d7a79f-1d10-39ef-58f0-5a1ddc6f030e@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============9020840449944986690=="
List-Id: <development.lists.ipfire.org>

--===============9020840449944986690==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>

> On 14 Feb 2022, at 21:06, Peter M=C3=BCller <peter.mueller(a)ipfire.org> wr=
ote:
>=20
> Reviewed-by: Peter M=C3=BCller <peter.mueller(a)ipfire.org>
>=20
>> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
>> ---
>> config/firewall/rules.pl | 10 ++++++++--
>> 1 file changed, 8 insertions(+), 2 deletions(-)
>>=20
>> 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) =3D @_;
>>=20
>> -	# Run ipset and restore the list of the given country code.
>> -	run("$IPSET restore < $Location::Functions::ipset_db_directory/$ccode.ip=
set4");
>> +	my $file_prefix =3D "ipset4";
>> +	my $db_file =3D "$Location::Functions::ipset_db_directory/$ccode.$file_p=
refix";
>> +
>> +	# 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");
>> +	}
>> }


--===============9020840449944986690==--