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 4/4] general-functions.pl: Do not die if no red interface
 could be determined.
Date: Wed, 09 Mar 2022 14:26:31 +0000
Message-ID: <C5224107-FA91-48FC-8673-5973BB190FD7@ipfire.org>
In-Reply-To: <20220309141232.2401848-4-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2192374685267393380=="
List-Id: <development.lists.ipfire.org>

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

Hello Stefan,

> On 9 Mar 2022, at 14:12, Stefan Schantl <stefan.schantl(a)ipfire.org> wrote:
>=20
> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> ---
> config/cfgroot/general-functions.pl | 15 +++++++++------
> 1 file changed, 9 insertions(+), 6 deletions(-)
>=20
> diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-f=
unctions.pl
> index 5118a9d69..6f49585dc 100644
> --- a/config/cfgroot/general-functions.pl
> +++ b/config/cfgroot/general-functions.pl
> @@ -1228,12 +1228,15 @@ sub firewall_reload() {
> # Function which will return the used interface for the red network zone (r=
ed0, ppp0, etc).
> # if you change this also check speed.cgi that include a local copy for sys=
temload reasons
> sub get_red_interface() {
> -
> -	open(IFACE, "${General::swroot}/red/iface") or die "Could not open /var/i=
pfire/red/iface";

You could have just replaced the =E2=80=9Cdie =E2=80=A6=E2=80=9D part with a =
return statement and save the extra check if the file exists.

Best,
-Michael

> -
> -	my $interface =3D <IFACE>;
> -	close(IFACE);
> -	chomp $interface;
> +	my $interface;
> +	my $red_iface_file =3D "${General::swroot}/red/iface";
> +
> +	if (-e $red_iface_file) {
> +		open(IFACE, "$red_iface_file") or die "Could not open $red_iface_file";
> +		$interface =3D <IFACE>;
> +		close(IFACE);
> +		chomp $interface;
> +	}
>=20
> 	return $interface;
> }
> --=20
> 2.30.2
>=20


--===============2192374685267393380==--