From mboxrd@z Thu Jan  1 00:00:00 1970
From: Peter =?utf-8?q?M=C3=BCller?= <peter.mueller@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] rules.pl: Fix creating rules for location based groups.
Date: Wed, 23 Mar 2022 17:12:03 +0000
Message-ID: <c3b8da6a-7001-4208-0a37-4a3fb8e659bd@ipfire.org>
In-Reply-To: <20220323170852.2964-1-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2446852320269678952=="
List-Id: <development.lists.ipfire.org>

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

Acked-by: Peter M=C3=BCller <peter.mueller(a)ipfire.org>

> The former used hash value only contains the country code when
> a rule for a single country should be created.
>=20
> In case a location group is used the hash value refers to the group name,
> which does not work here.
>=20
> The required country code is part of the processed string and can be omitted
> from here. This works well for single codes and location groups, because th=
ose
> are processed in a loop.
>=20
> Fixes #12809.
>=20
> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> ---
>  config/firewall/rules.pl | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
>=20
> diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl
> index d71304986..19dc7a6d1 100644
> --- a/config/firewall/rules.pl
> +++ b/config/firewall/rules.pl
> @@ -411,8 +411,9 @@ sub buildrules {
>  					if ($source =3D~ /mac/) {
>  						push(@source_options, $source);
>  					} elsif ($source =3D~ /-m set/) {
> -						# Grab location code from hash.
> -						my $loc_src =3D $$hash{$key}[4];
> +						# Split given arguments into single chunks to
> +						# obtain the set name.
> +						my ($a, $b, $c, $loc_src, $e) =3D split(/ /, $source);
> =20
>  						# Call function to load the networks list for this country.
>  						&ipset_restore($loc_src);
> @@ -425,8 +426,9 @@ sub buildrules {
>  					# Prepare destination options.
>  					my @destination_options =3D ();
>  					if ($destination =3D~ /-m set/) {
> -						# Grab location code from hash.
> -						my $loc_dst =3D $$hash{$key}[6];
> +						# Split given arguments into single chunks to
> +						# obtain the set name.
> +						my ($a, $b, $c, $loc_dst, $e) =3D split(/ /, $destination);
> =20
>  						# Call function to load the networks list for this country.
>  						&ipset_restore($loc_dst);

--===============2446852320269678952==--