require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
-my $css = <<END
+###--- HTML HEAD ---###
+my $extraHead = <<END
<style>
- table {
+ table#zoneconf {
width: 100%;
border-collapse: collapse;
+ border-style: hidden;
table-layout: fixed;
}
- tr {
+ /* row height */
+ #zoneconf tr {
height: 4em;
}
-
- td.narrow {
- width: 11em;
+ #zoneconf tr.half-height {
+ height: 2em;
+ }
+ #zoneconf tr.half-height > td {
+ padding: 2px 10px;
}
- td {
- padding: 5px;
- padding-left: 10px;
- padding-right: 10px;
- border: 0.5px solid black;
+ /* section separators */
+ #zoneconf tr.divider-top {
+ border-top: 2px solid $Header::bordercolour;
+ }
+ #zoneconf tr.divider-bottom {
+ border-bottom: 2px solid $Header::bordercolour;
}
- td.slightlygrey {
- background-color: #F0F0F0;
+ /* table cells */
+ #zoneconf td {
+ padding: 5px 10px;
+ border-left: 0.5px solid $Header::bordercolour;
+ text-align: center;
}
- td.h {
- background-color: grey;
+ /* grey header cells */
+ #zoneconf td.heading {
+ background-color: lightgrey;
color: white;
- font-weight: 800;
+ }
+ #zoneconf td.heading.bold::first-line {
+ font-weight: bold;
+ line-height: 1.6;
+ }
+
+ /* narrow left column with background color */
+ #zoneconf tr > td:first-child {
+ width: 11em;
+ }
+ #zoneconf tr.nic-row > td:first-child {
+ background-color: darkgray;
+ }
+ #zoneconf tr.nic-row {
+ border-bottom: 0.5px solid $Header::bordercolour;
+ }
+ #zoneconf tr.option-row > td:first-child {
+ background-color: gray;
+ }
+
+ /* alternating row background color */
+ #zoneconf tr {
+ background-color: $Header::table2colour;
+ }
+ #zoneconf tr:nth-child(2n+3) {
+ background-color: $Header::table1colour;
}
- td.green {
+ /* special cell colors */
+ #zoneconf td.green {
background-color: $Header::colourgreen;
}
- td.red {
+ #zoneconf td.red {
background-color: $Header::colourred;
}
- td.blue {
+ #zoneconf td.blue {
background-color: $Header::colourblue;
}
- td.orange {
+ #zoneconf td.orange {
background-color: $Header::colourorange;
}
- td.topleft {
- background-color: white;
- border-top-style: none;
- border-left-style: none;
- }
-
- td.textcenter {
- text-align: center;
+ #zoneconf td.topleft {
+ background-color: $Header::pagecolour;
}
input.vlanid {
width: 4em;
}
+ input.stp-priority {
+ width: 5em;
+ }
#submit-container {
width: 100%;
#submit-container.input {
margin-left: auto;
}
-
- button {
- margin-top: 1em;
- }
</style>
+
+<script src="/include/zoneconf.js"></script>
END
;
+###--- END HTML HEAD ---###
+### Read configuration ###
my %ethsettings = ();
my %vlansettings = ();
my %cgiparams = ();
&Header::showhttpheaders();
# Define all zones we will check for NIC assignment
-my @zones = ("green", "red", "orange", "blue");
+my @zones = ("red", "green", "orange", "blue");
# Get all physical NICs present
opendir(my $dh, "/sys/class/net/");
}
}
-&Header::openpage($Lang::tr{"zoneconf title"}, 1, $css);
+### 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 ###
+&Header::openpage($Lang::tr{"zoneconf title"}, 1, $extraHead);
&Header::openbigbox('100%', 'center');
### Evaluate POST parameters ###
}
}
+ # skip NIC/VLAN assignment and additional zone options for RED in PPP mode
next;
}
} elsif ($zone_mode eq "MACVTAP") {
$ethsettings{"${uc}_MODE"} = "macvtap";
}
+
+ # STP options
+ # (this has already been skipped when RED is in PPP mode, so we don't need to check for PPP here)
+ $ethsettings{"${uc}_STP"} = "";
+ my $stp_enabled = $cgiparams{"STP-$uc"} eq "on";
+ my $stp_priority = $cgiparams{"STP-PRIORITY-$uc"};
+
+ if($stp_enabled) {
+ unless($ethsettings{"${uc}_MODE"} eq "bridge") { # STP is only available in bridge mode
+ $VALIDATE_error = $Lang::tr{"zoneconf val stp zone mode error"};
+ last;
+ }
+ unless (looks_like_number($stp_priority) && ($stp_priority >= 1) && ($stp_priority <= 65535)) { # STP bridge priority range: 1..65535
+ $VALIDATE_error = $Lang::tr{"zoneconf val stp priority range error"};
+ last;
+ }
+ $ethsettings{"${uc}_STP"} = "on"; # network-hotplug-bridges expects "on"
+ $ethsettings{"${uc}_STP_PRIORITY"} = $stp_priority;
+ }
}
+ # validation failed, show error message and exit
if ($VALIDATE_error) {
&Header::openbox('100%', 'left', $Lang::tr{"error"});
- print "$VALIDATE_error<br><a href='/cgi-bin/zoneconf.cgi'><button>$Lang::tr{'ok'}</button></a>";
+ print "$VALIDATE_error<br><br><a href='$ENV{'SCRIPT_NAME'}'>$Lang::tr{'back'}</a>\n";
&Header::closebox();
&Header::closebigbox();
exit 0;
}
+ # new settings are valid, write configuration files
&General::writehash("${General::swroot}/ethernet/settings",\%ethsettings);
&General::writehash("${General::swroot}/ethernet/vlans",\%vlansettings);
$restart_notice = $Lang::tr{'zoneconf notice reboot'};
}
-&Header::openbox('100%', 'left', $Lang::tr{"zoneconf nic assignment"});
-
### START OF TABLE ###
+&Header::openbox('100%', 'left', $Lang::tr{"zoneconf nic assignment"});
+
print <<END
<form method='post' enctype='multipart/form-data'>
- <table>
- <tr>
- <td class="h narrow topleft"></td>
+ <table id="zoneconf">
+ <tr class="divider-bottom">
+ <td class="topleft"></td>
END
;
# Fill the table header with all activated zones
foreach (@zones) {
my $uc = uc $_;
- my $dev_name = $ethsettings{"${uc}_DEV"};
- if ($dev_name eq "") { # If the zone is not activated, don't show it
- next;
- }
+ # If the zone is not activated, don't show it
+ next unless is_zone_activated($_);
- # If the 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") {
my $red_type = $ethsettings{"RED_TYPE"};
- my $red_restricted = ($uc eq "RED" && ! ($red_type eq "STATIC" || $red_type eq "DHCP"));
- if ($red_restricted) {
- print "\t\t<td class='h textcenter $_'>$uc ($red_type)</td>\n";
+ unless (is_zonetype_ip($red_type)) {
+ print "\t\t<td class='heading bold $_'>$uc ($red_type)</td>\n";
next; # We're done here
}
}
print <<END
- <td class='h textcenter $_'>$uc<br>
+ <td class='heading bold $_'>$uc<br>
<select name="MODE $uc">
<option value="DEFAULT" $mode_selected{"DEFAULT"}>$Lang::tr{"zoneconf nicmode default"}</option>
<option value="BRIDGE" $mode_selected{"BRIDGE"}>$Lang::tr{"zoneconf nicmode bridge"}</option>
print "\t</tr>\n";
-my $slightlygrey = "";
-
+# NIC assignment matrix
foreach (@nics) {
my $mac = $_->[0];
my $nic = $_->[1];
my $wlan = $_->[2];
- print "\t<tr>\n";
- print "\t\t<td class='h narrow textcenter'>$nic<br>$mac</td>\n";
+ print "\t<tr class='nic-row'>\n";
+ print "\t\t<td class='heading bold'>$nic<br>$mac</td>\n";
# Iterate through all zones and check if the current NIC is assigned to it
foreach (@zones) {
my $uc = uc $_;
- my $dev_name = $ethsettings{"${uc}_DEV"};
+ my $highlight = "";
- if ($dev_name eq "") { # Again, skip the zone if it is not activated
- next;
- }
+ # If the zone is not activated, don't show it
+ next unless is_zone_activated($_);
if ($uc eq "RED") {
- my $red_type = $ethsettings{"RED_TYPE"};
- my $red_restricted = ($uc eq "RED" && ! ($red_type eq "STATIC" || $red_type eq "DHCP"));
-
# VLANs/Bridging is not possible if the RED interface is set to PPP, PPPoE, VDSL, ...
- if ($red_restricted) {
+ unless (is_zonetype_ip($ethsettings{"RED_TYPE"})) {
my $checked = "";
if ($mac eq $ethsettings{"${uc}_MACADDR"}) {
$checked = "checked";
+ $highlight = $_;
}
print <<END
- <td class="textcenter $slightlygrey">
- <input type="radio" id="PPPACCESS $mac" name="PPPACCESS" value="$mac" $checked>
+ <td class="$highlight">
+ <input type="radio" name="PPPACCESS" value="$mac" data-zone="RED" data-mac="$mac" onchange="highlightAccess(this)" $checked>
</td>
END
;
$access_selected{"NONE"} = ($access_selected{"NATIVE"} eq "") && ($access_selected{"VLAN"} eq "") ? "selected" : "";
my $vlan_disabled = ($wlan) ? "disabled" : "";
+ # If the interface is assigned, hightlight table cell
+ if ($access_selected{"NONE"} eq "") {
+ $highlight = $_;
+ }
+
print <<END
- <td class="textcenter $slightlygrey">
- <select name="ACCESS $uc $mac" onchange="document.getElementById('TAG $uc $mac').disabled = (this.value === 'VLAN' ? false : true)">
+ <td class="$highlight">
+ <select name="ACCESS $uc $mac" data-zone="$uc" data-mac="$mac" onchange="highlightAccess(this)">
<option value="NONE" $access_selected{"NONE"}>- $Lang::tr{"zoneconf access none"} -</option>
<option value="NATIVE" $access_selected{"NATIVE"}>$Lang::tr{"zoneconf access native"}</option>
<option value="VLAN" $access_selected{"VLAN"} $vlan_disabled>$Lang::tr{"zoneconf access vlan"}</option>
</select>
- <input type="number" class="vlanid" id="TAG $uc $mac" name="TAG $uc $mac" min="1" max="4095" value="$zone_vlan_id" $field_disabled>
+ <input type="number" class="vlanid" id="TAG-$uc-$mac" name="TAG $uc $mac" min="1" max="4095" value="$zone_vlan_id" $field_disabled>
</td>
END
;
}
print "\t</tr>\n";
+}
- if ($slightlygrey) {
- $slightlygrey = "";
- } else {
- $slightlygrey = "slightlygrey";
+# STP options
+my @stp_html = (); # form fields buffer (two rows)
+
+foreach (@zones) { # load settings and prepare form elements for each zone
+ 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, ...
+ if ($uc eq "RED") {
+ unless (is_zonetype_ip($ethsettings{"RED_TYPE"})) {
+ push(@stp_html, ["\t\t<td></td>\n", "\t\t<td></td>\n"]); # print empty cell
+ next;
+ }
}
+
+ # load configuration
+ my $stp_available = $ethsettings{"${uc}_MODE"} eq "bridge"; # STP is only available in bridge mode
+ my $stp_enabled = $ethsettings{"${uc}_STP"} eq "on";
+ my $stp_priority = $ethsettings{"${uc}_STP_PRIORITY"};
+
+ # form element modifiers
+ my $checked = "";
+ my $disabled = "";
+ $checked = "checked" if ($stp_available && $stp_enabled);
+ $disabled = "disabled" unless $stp_available;
+
+ # enable checkbox HTML
+ my $row_1 = <<END
+ <td>
+ <input type="checkbox" name="STP-$uc" $disabled $checked>
+ </td>
+END
+;
+ $disabled = "disabled" unless $stp_enabled; # STP priority can't be entered if STP is disabled
+
+ # priority input box HTML
+ my $row_2 = <<END
+ <td>
+ <input type="number" class="stp-priority" name="STP-PRIORITY-$uc" min="1" max="65535" value="$stp_priority" $disabled>
+ </td>
+END
+;
+ # add fields to buffer
+ push(@stp_html, [$row_1, $row_2]);
}
+# print two rows of prepared form elements
+print <<END
+ <tr class="half-height divider-top option-row">
+ <td class="heading bold">$Lang::tr{"zoneconf stp enable"}</td>
+END
+;
+foreach (@stp_html) {
+ print $_->[0]; # row 1
+}
+print <<END
+ </tr>
+ <tr class="half-height option-row">
+ <td class="heading">$Lang::tr{"zoneconf stp priority"}</td>
+END
+;
+foreach (@stp_html) {
+ print $_->[1]; # row 2
+}
+print "\t</tr>\n";
+
+# footer and submit button
print <<END
</table>
projects / people / pmueller / ipfire-2.x.git / blobdiff