From mboxrd@z Thu Jan  1 00:00:00 1970
From: Leo-Andres Hofmann <hofmann@leo-andres.de>
To: development@lists.ipfire.org
Subject: [PATCH v2 5/6] zoneconf.cgi: Import network-functions.pl
Date: Thu, 18 Feb 2021 15:30:15 +0100
Message-ID: <20210218143016.972-5-hofmann@leo-andres.de>
In-Reply-To: <20210218143016.972-1-hofmann@leo-andres.de>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3540273664885563703=="
List-Id: <development.lists.ipfire.org>

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

Remove custom functions and use network-functions.pl instead to detect
the available zones correctly. This also removes the requirement that
a device must be assigned for a zone to become visible/configurable.

Fixes: #12568

Signed-off-by: Leo-Andres Hofmann <hofmann(a)leo-andres.de>
---
 html/cgi-bin/zoneconf.cgi | 37 ++++++++-----------------------------
 1 file changed, 8 insertions(+), 29 deletions(-)

diff --git a/html/cgi-bin/zoneconf.cgi b/html/cgi-bin/zoneconf.cgi
index eb6cd0e66..9d01d06ce 100644
--- a/html/cgi-bin/zoneconf.cgi
+++ b/html/cgi-bin/zoneconf.cgi
@@ -25,6 +25,7 @@ use Scalar::Util qw(looks_like_number);
 require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
+require "${General::swroot}/network-functions.pl";
=20
 ###--- HTML HEAD ---###
 my $extraHead =3D <<END
@@ -152,8 +153,8 @@ my $restart_notice =3D "";
 &Header::getcgihash(\%cgiparams);
 &Header::showhttpheaders();
=20
-# Define all zones we will check for NIC assignment
-my @zones =3D ("red", "green", "orange", "blue");
+# Get all network zones that are currently enabled
+my @zones =3D Network::get_available_network_zones();
=20
 # Get all physical NICs present
 opendir(my $dh, "/sys/class/net/");
@@ -187,20 +188,6 @@ foreach (@nics) {
 	}
 }
=20
-### Functions ###
-
-# Check if a zone is in IP mode or in PPP, PPPoE, VDSL, ... mode
-sub is_zonetype_ip {
-	my $zone_type =3D shift;
-	return ($zone_type eq "STATIC" || $zone_type eq "DHCP");
-}
-
-# Check if a zone is activated (device assigned)
-sub is_zone_activated {
-	my $zone =3D uc shift;
-	return ($ethsettings{"${zone}_DEV"} ne "");
-}
-
 ### START PAGE ###
 &Header::openpage($Lang::tr{"zoneconf title"}, 1, $extraHead);
 &Header::openbigbox('100%', 'center');
@@ -211,7 +198,8 @@ if ($cgiparams{"ACTION"} eq $Lang::tr{"save"}) {
 	my %VALIDATE_nic_check =3D ();
 	my $VALIDATE_error =3D "";
=20
-	foreach (@zones) {
+	# Loop trough all known zones to ensure a complete configuration file is cr=
eated
+	foreach (@Network::known_network_zones) {
 		my $uc =3D uc $_;
 		my $slave_string =3D "";
 		my $zone_mode =3D $cgiparams{"MODE $uc"};
@@ -383,14 +371,11 @@ END
 foreach (@zones) {
 	my $uc =3D uc $_;
=20
-	# If the zone is not activated, don't show it
-	next unless is_zone_activated($_);
-
 	# If the red zone is in PPP mode, don't show a mode dropdown
 	if ($uc eq "RED") {
 		my $red_type =3D $ethsettings{"RED_TYPE"};
=20
-		unless (is_zonetype_ip($red_type)) {
+		unless (Network::is_red_mode_ip()) {
 			print "\t\t<td class=3D'heading bold $_'>$uc ($red_type)</td>\n";
=20
 			next; # We're done here
@@ -436,12 +421,9 @@ foreach (@nics) {
 		my $uc =3D uc $_;
 		my $highlight =3D "";
=20
-		# If the zone is not activated, don't show it
-		next unless is_zone_activated($_);
-
 		if ($uc eq "RED") {
 			# VLANs/Bridging is not possible if the RED interface is set to PPP, PPPo=
E, VDSL, ...
-			unless (is_zonetype_ip($ethsettings{"RED_TYPE"})) {
+			unless (Network::is_red_mode_ip()) {
 				my $checked =3D "";
=20
 				if ($mac eq $ethsettings{"${uc}_MACADDR"}) {
@@ -519,12 +501,9 @@ my @stp_html =3D (); # form fields buffer (two rows)
 foreach (@zones) { # load settings and prepare form elements for each zone
 	my $uc =3D uc $_;
=20
-	# skip if zone is not activated
-	next unless is_zone_activated($_);
-
 	# STP is not available if the RED interface is set to PPP, PPPoE, VDSL, ...
 	if ($uc eq "RED") {
-		unless (is_zonetype_ip($ethsettings{"RED_TYPE"})) {
+		unless (Network::is_red_mode_ip()) {
 			push(@stp_html, ["\t\t<td></td>\n", "\t\t<td></td>\n"]); # print empty ce=
ll
 			next;
 		}
--=20
2.27.0.windows.1


--===============3540273664885563703==--