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 2/4] connections.cgi: Ignore empty interfaces
Date: Mon, 09 Dec 2024 11:30:57 +0000
Message-ID: <9D970F74-3245-4442-8DD7-BC500E9AEA9A@ipfire.org>
In-Reply-To: <c7616ec2-dde8-4fdd-80b6-a3a27f5eed56@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1465060800273467965=="
List-Id: <development.lists.ipfire.org>

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

This is also an option.

I found throwing away what is empty in the loop was shorter to write.

-Michael

> On 7 Dec 2024, at 23:56, Bernhard Bitsch <bbitsch(a)ipfire.org> wrote:
>=20
> If %interfaces contains defined interfaces only, this is not necessary.
>=20
> For blue and orange interfaces this can be done by
>=20
> my %interfaces =3D (
> $settings{'GREEN_DEV'}  =3D> ${Header::colourgreen},
>=20
> # IPsec
> "gre[0-9]+"             =3D> ${Header::colourvpn},
> "vti[0-9]+"             =3D> ${Header::colourvpn},
>=20
> # OpenVPN
> "tun[0-9]+"             =3D> ${Header::colourovpn},
> );
>=20
> # BLUE interface
> if ($settings{BLUE_DEV} ne "") {
> $interfaces{$settings{'BLUE_DEV'} } =3D ${Header::colourblue};
> }
>=20
> #ORANGE interface
> if ($settings{ORANGE_DEV} ne "") {
> $interfaces{$settings{'ORANGE_DEV'} }=3D ${Header::colourorange};
> }
>=20
> For VPN this has to be adapted.
>=20
> Reviewed-by-: Bernhard Bitsch <bbitsch(a)ipfire.org>
>=20
> Am 06.12.2024 um 17:44 schrieb Michael Tremer:
>> Parsing any custom routes for any custom interfaces was broken so that
>> arbitrary routes were imported when not all interfaces were in use.
>> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
>> ---
>>  html/cgi-bin/connections.cgi | 3 +++
>>  1 file changed, 3 insertions(+)
>> diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi
>> index af375effe..705118576 100644
>> --- a/html/cgi-bin/connections.cgi
>> +++ b/html/cgi-bin/connections.cgi
>> @@ -89,6 +89,9 @@ my @routes =3D &General::system_output("ip", "route", "s=
how");
>>    # Find all routes
>>  foreach my $intf (keys %interfaces) {
>> + # Skip empty interfaces
>> + next if ($intf eq "");
>> +
>>   foreach my $route (grep(/dev ${intf}/, @routes)) {
>>   if ($route =3D~ m/^(\d+\.\d+\.\d+\.\d+\/\d+)/) {
>>   $networks{$1} =3D $interfaces{$intf};
>=20


--===============1465060800273467965==--