From patchwork Sat Jul 29 23:15:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: fff-web: Add switch port assignment indication to ports.html From: Adrian Schmutzler X-Patchwork-Id: 413 Message-Id: <1501370108-20142-1-git-send-email-freifunk@adrianschmutzler.de> To: franken-dev@freifunk.net Date: Sun, 30 Jul 2017 01:15:08 +0200 Signed-off-by: Adrian Schmutzler Tested-by: Adrian Schmutzler --- .../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 <% + 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 "" 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; +}
" echo "${port}
" - echo "\"${link}\"
" + echo "\"${link}\"

" + echo "$assign
" echo "$speed
$duplex
" echo "