<style>
table {
width: 100%;
+ border-collapse: collapse;
+ table-layout: fixed;
}
tr {
height: 4em;
}
- td:first-child {
- width: 1px;
+ tr.thin {
+ height: 3em;
+ }
+
+ td.narrow {
+ width: 11em;
}
td {
border: 0.5px solid black;
}
- table {
- border-collapse: collapse;
+ td.slightlygrey {
+ background-color: #F0F0F0;
}
td.h {
}
#submit-container {
- display: flex;
width: 100%;
- justify-content: space-between;
padding-top: 20px;
- text-align: left;
+ text-align: right;
+ color: red;
}
#submit-container.input {
button {
margin-top: 1em;
}
-
</style>
END
;
my %vlansettings = ();
my %cgiparams = ();
+my $restart_notice = "";
+
&General::readhash("${General::swroot}/ethernet/settings",\%ethsettings);
&General::readhash("${General::swroot}/ethernet/vlans",\%vlansettings);
my $slave_string = "";
my $zone_mode = $cgiparams{"MODE $uc"};
my $VALIDATE_vlancount = 0;
+ my $VALIDATE_zoneslaves = 0;
$ethsettings{"${uc}_MACADDR"} = "";
$ethsettings{"${uc}_MODE"} = "";
my $mac = $_->[0];
my $nic_access = $cgiparams{"ACCESS $uc $mac"};
- if (! ($nic_access eq "NONE")) {
+ if ($nic_access ne "NONE") {
if ($VALIDATE_nic_check{"RESTRICT $mac"}) { # If this interface is already assigned to RED in PPP mode, throw an error
$VALIDATE_error = $Lang::tr{"zoneconf val ppp assignment error"};
- next;
+ last;
+ }
+
+ if ($zone_mode ne "BRIDGE" && $VALIDATE_zoneslaves > 0 && $nic_access ne "") {
+ $VALIDATE_error = $Lang::tr{"zoneconf val zoneslave amount error"};
+ last;
}
$VALIDATE_nic_check{"ACC $mac"} = 1;
+ $VALIDATE_zoneslaves++;
}
if ($nic_access eq "NATIVE") {
if ($VALIDATE_nic_check{"NATIVE $mac"}) {
$VALIDATE_error = $Lang::tr{"zoneconf val native assignment error"};
- next;
+ last;
}
$VALIDATE_nic_check{"NATIVE $mac"} = 1;
if ($VALIDATE_nic_check{"VLAN $mac $vlan_tag"}) {
$VALIDATE_error = $Lang::tr{"zoneconf val vlan tag assignment error"};
- next;
+ last;
}
$VALIDATE_nic_check{"VLAN $mac $vlan_tag"} = 1;
if (! looks_like_number($vlan_tag)) {
- next;
+ last;
}
if ($vlan_tag < 1 || $vlan_tag > 4095) {
- next;
+ last;
}
my $rnd_mac = &Network::random_mac();
if ($VALIDATE_vlancount > 1) {
$VALIDATE_error = $Lang::tr{"zoneconf val vlan amount assignment error"};
- next;
+ last;
}
chop($slave_string);
&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 ###
print <<END
- <form method='post' enctype='multipart/form-data'>
- <tr>
- <td class="h topleft" /td>
+<form method='post' enctype='multipart/form-data'>
+ <table>
+ <tr>
+ <td class="h narrow topleft" /td>
END
;
-# Fill the table header with all physical NICs
-foreach (@nics) {
- my $mac = $_->[0];
- my $nic = $_->[1];
-
- print "<td class='h textcenter'>$nic<br>$mac</td>";
-}
-
-print "</tr>";
-
+# Fill the table header with all activated zones
foreach (@zones) {
- print "<tr>";
my $uc = uc $_;
-
my $dev_name = $ethsettings{"${uc}_DEV"};
- if ($dev_name eq "") { # If the zone is not activated, color it light grey
- print "<td class='h disabled'>$uc</td>";
-
- foreach (@nics) {
- print "<td class='disabled'/>";
- }
-
- print "</tr>";
+ if ($dev_name eq "") { # If the zone is not activated, don't show it
next;
}
+ # If the 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"));
- # VLANs/Bridging is not possible if the RED interface is set to PPP, PPPoE, VDSL, ...
if ($red_restricted) {
- print "<td class='h $_'>$uc<br>($red_type)</td>";
+ print "<td class='h textcenter $_'>$uc ($red_type)</td>";
- foreach (@nics) {
- my $mac = $_->[0];
- my $checked = "";
-
- if ($mac eq $ethsettings{"${uc}_MACADDR"}) {
- $checked = "checked";
- }
-
- print "<td class='textcenter'><input type='radio' id='PPPACCESS $mac' name='PPPACCESS' value='$mac' $checked></td>";
- }
-
- print "</tr>";
next; # We're done here
}
}
}
print <<END
- <td class='h $_'>$uc<br>
+ <td class='h textcenter $_'>$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>
</td>
END
;
+}
+
+print "</tr>";
+
+my $slightlygrey = "";
+
+foreach (@nics) {
+ my $mac = $_->[0];
+ my $nic = $_->[1];
+ my $wlan = $_->[2];
+
+ print "<tr><td class='h narrow textcenter'>$nic<br>$mac</td>";
+
+ # 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"};
+
+ if ($dev_name eq "") { # Again, skip the zone if it is not activated
+ next;
+ }
- # ZONE_PARENT_DEV is set if this zone accesses any interface via a VLAN
- my $zone_parent_dev = $vlansettings{"${uc}_PARENT_DEV"};
+ 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 ZONE_PARENT_DEV is set to a NICs name (e.g. green0 or eth0) instead of a MAC address, we have to find out this NICs MAC address
- $zone_parent_dev = &Network::get_mac_by_name($zone_parent_dev);
+ # VLANs/Bridging is not possible if the RED interface is set to PPP, PPPoE, VDSL, ...
+ if ($red_restricted) {
+ my $checked = "";
+
+ if ($mac eq $ethsettings{"${uc}_MACADDR"}) {
+ $checked = "checked";
+ }
+
+ print "<td class='textcenter $slightlygrey'><input type='radio' id='PPPACCESS $mac' name='PPPACCESS' value='$mac' $checked></td>";
+ next; # We're done here
+ }
+ }
- foreach (@nics) { # Check for all nics if they are assigned to the current zone
my %access_selected = ();
- my $mac = $_->[0];
- my $wlan = $_->[2];
+ my $zone_mode = $ethsettings{"${uc}_MODE"};
+ my $zone_parent_dev = $vlansettings{"${uc}_PARENT_DEV"}; # ZONE_PARENT_DEV is set if this zone accesses any interface via a VLAN
my $field_disabled = "disabled"; # Only enable the VLAN ID input field if the current access mode is VLAN
my $zone_vlan_id = "";
+ # If ZONE_PARENT_DEV is set to a NICs name (e.g. green0 or eth0) instead of a MAC address, we have to find out this NICs MAC address
+ $zone_parent_dev = &Network::get_mac_by_name($zone_parent_dev);
+
# If the current NIC is accessed by the current zone via a VLAN, the ZONE_PARENT_DEV option corresponds to the current NIC
if ($mac eq $zone_parent_dev) {
$access_selected{"VLAN"} = "selected";
$field_disabled = "";
$zone_vlan_id = $vlansettings{"${uc}_VLAN_ID"};
- }
-
- # If the current zone is in bridge mode, all corresponding NICs (Native as well as VLAN) are set via the ZONE_SLAVES option
- if ($zone_mode eq "bridge") {
+ } elsif ($zone_mode eq "bridge") { # If the current zone is in bridge mode, all corresponding NICs (Native as well as VLAN) are set via the ZONE_SLAVES option
my @slaves = split(/ /, $ethsettings{"${uc}_SLAVES"});
foreach (@slaves) {
last;
}
}
- } else { # Native access via ZONE_MACADDR is only set if the zone does not access a NIC via a VLAN and the zone is not in bridge mode
- if ($mac eq $ethsettings{"${uc}_MACADDR"}) {
- $access_selected{"NATIVE"} = "selected";
- }
+ } elsif ($mac eq $ethsettings{"${uc}_MACADDR"}) { # Native access via ZONE_MACADDR is only set if the zone does not access a NIC via a VLAN and the zone is not in bridge mode
+ $access_selected{"NATIVE"} = "selected";
}
$access_selected{"NONE"} = ($access_selected{"NATIVE"} eq "") && ($access_selected{"VLAN"} eq "") ? "selected" : "";
my $vlan_disabled = ($wlan) ? "disabled" : "";
print <<END
- <td class="textcenter">
+ <td class="textcenter $slightlygrey">
<select name="ACCESS $uc $mac" onchange="document.getElementById('TAG $uc $mac').disabled = (this.value === 'VLAN' ? false : true)">
+ <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>
- <option value="NONE" $access_selected{"NONE"}>$Lang::tr{"zoneconf access none"}</option>
</select>
<input type="number" id="TAG $uc $mac" name="TAG $uc $mac" min="1" max="4095" value="$zone_vlan_id" $field_disabled>
</td>
END
;
-
}
+
print "</tr>";
+
+ if ($slightlygrey) {
+ $slightlygrey = "";
+ } else {
+ $slightlygrey = "slightlygrey";
+ }
}
print <<END
</table>
- <div id="submit-container">
- <font color="red">$Lang::tr{"zoneconf warning incorrect configuration"}</font>
- <input type="submit" name="ACTION" value="$Lang::tr{"save"}">
- </div>
- </form>
+
+ <div id="submit-container">
+ $restart_notice
+ <input type="submit" name="ACTION" value="$Lang::tr{"save"}">
+ </div>
+</form>
END
;
projects / ipfire-2.x.git / blobdiff