[PATCH 0/2] zonconf: replace the nic-names with eth... and wlan... or not?

[PATCH 0/2] zonconf: replace the nic-names with eth... and wlan... or not?

[Alex Koch]

[-- Attachment #1: Type: text/plain, Size: 1843 bytes --]

Hi,

I stumbled into this when I was searching for an error in my vlan and bridge-config and want to start a discussion about if this should be changed or not.

The zoneconf.cgi contains the following code-snippet:

> # Name the physical NICs
> # Even though they may not be really named like this, we will name them ethX or wlanX
> my $ethcount = 0;
> my $wlancount = 0;
>
> foreach (@nics) {
> 	my $nic = $_->[1];
>
> 	if (-e "/sys/class/net/$nic/wireless") {
> 		$_->[1] = "wlan$wlancount";
> 		$_->[2] = 1;
> 		$wlancount++;
> 	} else {
> 		$_->[1] = "eth$ethcount";
> 		$ethcount++;
> 	}
> }

This renames all the nics to ethX or wlanX for the WUI. When you use any commandline tool (e.g ip addr or brctl show) the names of the NICs will mismatch with the ones shown in the WUI. Same for the assigened VLAN-IDs.

For example, one of my setups:

- WUI name --> real name
- eth0 --> red0
- eth1 --> eth1
- eth2 --> orange0
- wlan0 --> blue0
- wlan1 --> wlan1

What is the goal of doing this? I personally think this is more confusing than useful. I would prefer to not rename the NICs. What do you think?

I attached a patch to change the naming back to the real names. Please decide to merge it or not, depending on where the discussion ends.

Secondly I created a patch to add the current output of "brctl show" and "ip addr" to the zoneconfig page. It's quite useful to have this by the hand without having to open a shell sometimes.

Regards, Alex


Alex Koch (2):
  zoneconf: Show real names of NICs in the WUI
  zoneconf: Add status output of "brctl show" and "ip addr"

 html/cgi-bin/zoneconf.cgi | 34 ++++++++++++++++++++++++----------
 langs/de/cgi-bin/de.pl    |  5 ++++-
 langs/en/cgi-bin/en.pl    |  5 ++++-
 3 files changed, 32 insertions(+), 12 deletions(-)

--
2.17.1

[PATCH 1/2] zoneconf: Show real names of NICs in the WUI

[Alex Koch]

[-- Attachment #1: Type: text/plain, Size: 1100 bytes --]

Currently the real names of all NICs are changed to ethX and wlanX in the WUI. This is confusing, because command line tools like ip or brctl print out the real names.

Signed-off-by: Alex Koch <ipfire(a)starkstromkonsument.de>
---
 html/cgi-bin/zoneconf.cgi | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/html/cgi-bin/zoneconf.cgi b/html/cgi-bin/zoneconf.cgi
index 6b8642818..bb24347df 100644
--- a/html/cgi-bin/zoneconf.cgi
+++ b/html/cgi-bin/zoneconf.cgi
@@ -144,21 +144,12 @@ closedir($dh);
 
 @nics = sort {$a->[0] cmp $b->[0]} @nics; # Sort nics by their MAC address
 
-# Name the physical NICs
-# Even though they may not be really named like this, we will name them ethX or wlanX
-my $ethcount = 0;
-my $wlancount = 0;
-
 foreach (@nics) {
 	my $nic = $_->[1];
 
+	# Test if NIC is a wireless interface to disable VLAN-Option in Dropdown
 	if (-e "/sys/class/net/$nic/wireless") {
-		$_->[1] = "wlan$wlancount";
 		$_->[2] = 1;
-		$wlancount++;
-	} else {
-		$_->[1] = "eth$ethcount";
-		$ethcount++;
 	}
 }
 
-- 
2.17.1

[PATCH 2/2] zoneconf: Add status output of "brctl show" and "ip addr"

[Alex Koch]

[-- Attachment #1: Type: text/plain, Size: 3577 bytes --]

Signed-off-by: Alex Koch <ipfire(a)starkstromkonsument.de>
---
 html/cgi-bin/zoneconf.cgi | 23 +++++++++++++++++++++++
 langs/de/cgi-bin/de.pl    |  5 ++++-
 langs/en/cgi-bin/en.pl    |  5 ++++-
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/html/cgi-bin/zoneconf.cgi b/html/cgi-bin/zoneconf.cgi
index bb24347df..71b5c1550 100644
--- a/html/cgi-bin/zoneconf.cgi
+++ b/html/cgi-bin/zoneconf.cgi
@@ -97,6 +97,10 @@ my $css = <<END
 		width: 4em;
 	}
 
+	p.notice {
+		color: red;
+	}
+
 	#submit-container {
 		width: 100%;
 		padding-top: 20px;
@@ -456,5 +460,24 @@ END
 ### END OF TABLE ###
 
 &Header::closebox();
+
+&Header::openbox('100%', 'left', $Lang::tr{"zoneconf brctl show"});
+print <<END
+        <p class="notice">$Lang::tr{"zoneconf notice uptodate"}</p>
+END
+;
+my $br_config = `brctl show`;
+print "<pre>$br_config</pre>";
+&Header::closebox();
+
+&Header::openbox('100%', 'left', $Lang::tr{"zoneconf ip addr"});
+print <<END
+        <p class="notice">$Lang::tr{"zoneconf notice uptodate"}</p>
+END
+;
+my $if_config = `ip addr`;
+print "<pre>$if_config</pre>";
+&Header::closebox();
+
 &Header::closebigbox();
 &Header::closepage();
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 2e67e495f..363f11213 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1,4 +1,4 @@
-%tr = ( 
+%tr = (
 %tr,
 
 '24 hours' => '24 Stunden',
@@ -2905,11 +2905,14 @@
 'zoneconf access native' => 'Nativ',
 'zoneconf access none' => 'Keine',
 'zoneconf access vlan' => 'VLAN',
+'zoneconf brctl show' => 'Status: Netzwerkbrücken',
+'zoneconf ip addr' => 'Status: Netzwerkkarten',
 'zoneconf nic assignment' => 'Netzwerkkartenzuordnung',
 'zoneconf nicmode bridge' => 'Brücke',
 'zoneconf nicmode default' => 'Normal',
 'zoneconf nicmode macvtap' => 'MacVTap',
 'zoneconf notice reboot' => 'Bitte einen Neustart durchführen, um die Änderungen zu übernehmen.',
+'zoneconf notice uptodate' => 'ACHTUNG: Falls Änderungen an der Netzwerkkartenzuordnung vorgenommen wurden, werden diese hier erst nach einem Neustart angezeigt!',
 'zoneconf title' => 'Zonen einrichten',
 'zoneconf val native assignment error' => 'Eine Netzwerkkarte kann nicht von mehreren Zonen nativ verwendet werden.',
 'zoneconf val ppp assignment error' => 'Die Netzwerkkarte, die von RED im PPP-Modus verwendet wird, kann keiner anderen Zone zugeordnet werden.',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 8b7e63cb8..d440d0528 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1,4 +1,4 @@
-%tr = ( 
+%tr = (
 %tr,
 
 '24 hours' => '24 Hours',
@@ -2951,11 +2951,14 @@
 'zoneconf access native' => 'Native',
 'zoneconf access none' => 'None',
 'zoneconf access vlan' => 'VLAN',
+'zoneconf brctl show' => 'Status: Bridges',
+'zoneconf ip addr' => 'Status: Interfaces',
 'zoneconf nic assignment' => 'NIC Assignment',
 'zoneconf nicmode bridge' => 'Bridge',
 'zoneconf nicmode default' => 'Default',
 'zoneconf nicmode macvtap' => 'MacVTtap',
 'zoneconf notice reboot' => 'Please reboot to apply your changes.',
+'zoneconf notice uptodate' => 'Attention: If you changed your NIC Assignment, a reboot is required for the changes to be shown!',
 'zoneconf title' => 'Zone Configuration',
 'zoneconf val native assignment error' => 'A NIC cannot be accessed natively by more than one zone.',
 'zoneconf val ppp assignment error' => 'The NIC used for RED in PPP mode cannot be accessed by any other zone.',
-- 
2.17.1