[PATCH] fff-web: Add switch port assignment indication to ports.html

Adrian Schmutzler freifunk at adrianschmutzler.de
So Jul 30 01:15:08 CEST 2017


Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>

Tested-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
---
 .../fff/fff-web/files/www/ssl/cgi-bin/ports.html        | 17 ++++++++++++++++-
 src/packages/fff/fff-web/files/www/ssl/style.css        |  5 +++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/ports.html b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/ports.html
index 9d54be7..5e87df4 100755
--- a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/ports.html
+++ b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/ports.html
@@ -36,6 +36,9 @@ fi
 		<table>
 			<tr>
 				<%
+				batmanports=$(swconfig dev switch0 vlan 3 show | grep 'ports:')
+				clientports=$(swconfig dev switch0 vlan 1 show | grep 'ports:')
+				wanports=$(swconfig dev switch0 vlan 2 show | grep 'ports:')
 				swconfig dev switch0 show | grep "\t*link:" | while read line ; do
 					line=$(echo "$line" | tr -d '\n' | tr -d '\t')
 					port=$(echo "$line" | sed 's/.* port:\([^ ]*\) .*/\1/')
@@ -47,10 +50,22 @@ fi
 						speed="no link"
 						duplex=""
 					fi
+					if (echo "$clientports" | grep -q "${port}t") || (echo "$batmanports" | grep -q "${port}t") ; then
+						assign="CPU"
+					elif echo "$clientports" | grep -q "${port}" ; then
+						assign="CLIENT"
+					elif echo "$batmanports" | grep -q "${port}" ; then
+						assign="BATMAN"
+					elif echo "$wanports" | grep -q "${port}" ; then
+						assign="WAN"
+					else
+						assign="Unknown"
+					fi
 					port="Port ${port}"
 					echo "<td class=\"swport\">"
 					echo "<span class=\"port\">${port}</span><br />"
-					echo "<img src=\"/port_${link}.png\" alt=\"${link}\" /><br />"
+					echo "<img src=\"/port_${link}.png\" alt=\"${link}\" /><br /><br />"
+					echo "<span class=\"assign\">$assign</span><br />"
 					echo "<span class=\"stat\">$speed<br />$duplex</span>"
 					echo "</td>"
 				done
diff --git a/src/packages/fff/fff-web/files/www/ssl/style.css b/src/packages/fff/fff-web/files/www/ssl/style.css
index b9e0d9f..713397e 100644
--- a/src/packages/fff/fff-web/files/www/ssl/style.css
+++ b/src/packages/fff/fff-web/files/www/ssl/style.css
@@ -218,3 +218,8 @@ pre {
 .swport .stat {
 	font-size: 10px;
 }
+
+.swport .assign {
+	font-weight: bold;
+	font-size: 11px;
+}
-- 
2.7.4



Mehr Informationen über die Mailingliste franken-dev