From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bernhard Bitsch <bbitsch@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH 2/4] connections.cgi: Ignore empty interfaces
Date: Sun, 08 Dec 2024 00:56:04 +0100
Message-ID: <c7616ec2-dde8-4fdd-80b6-a3a27f5eed56@ipfire.org>
In-Reply-To: <20241206164417.3840426-2-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1466861768445141803=="
List-Id: <development.lists.ipfire.org>

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

If %interfaces contains defined interfaces only, this is not necessary.

For blue and orange interfaces this can be done by

my %interfaces =3D (
	$settings{'GREEN_DEV'}  =3D> ${Header::colourgreen},

	# IPsec
	"gre[0-9]+"             =3D> ${Header::colourvpn},
	"vti[0-9]+"             =3D> ${Header::colourvpn},

	# OpenVPN
	"tun[0-9]+"             =3D> ${Header::colourovpn},
);

# BLUE interface
if ($settings{BLUE_DEV} ne "") {
	$interfaces{$settings{'BLUE_DEV'} } =3D ${Header::colourblue};
}

#ORANGE interface
if ($settings{ORANGE_DEV} ne "") {
	$interfaces{$settings{'ORANGE_DEV'} }=3D ${Header::colourorange};
}

For VPN this has to be adapted.

Reviewed-by-: Bernhard Bitsch <bbitsch(a)ipfire.org>

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.
>=20
> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
> ---
>   html/cgi-bin/connections.cgi | 3 +++
>   1 file changed, 3 insertions(+)
>=20
> 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", "sh=
ow");
>  =20
>   # 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};


--===============1466861768445141803==--