webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 03:07:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

zoneconf.cgi: Import network-functions.pl

Browse Source 
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@leo-andres.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Leo-Andres Hofmann
2021-02-18 15:30:15 +01:00
committed by Michael Tremer
parent b4434345dc
commit 5262805261
1 changed files with 8 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
html/cgi-bin/zoneconf.cgi
View File

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