Re: [PATCH 2/4] connections.cgi: Ignore empty interfaces

[Bernhard Bitsch <bbitsch@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 1637 bytes --]

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

For blue and orange interfaces this can be done by

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

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

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

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

#ORANGE interface
if ($settings{ORANGE_DEV} ne "") {
	$interfaces{$settings{'ORANGE_DEV'} }= ${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.
> 
> 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 = &General::system_output("ip", "route", "show");
>   
>   # Find all routes
>   foreach my $intf (keys %interfaces) {
> +	# Skip empty interfaces
> +	next if ($intf eq "");
> +
>   	foreach my $route (grep(/dev ${intf}/, @routes)) {
>   		if ($route =~ m/^(\d+\.\d+\.\d+\.\d+\/\d+)/) {
>   			$networks{$1} = $interfaces{$intf};