From patchwork Fri Oct 6 21:33:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: fff-web: Show hood in public and internal web interface From: Adrian Schmutzler X-Patchwork-Id: 536 Message-Id: <1507325580-49117-1-git-send-email-freifunk@adrianschmutzler.de> To: franken-dev@freifunk.net Date: Fri, 6 Oct 2017 23:33:00 +0200 Signed-off-by: Adrian Schmutzler Tested-by: Adrian Schmutzler Reviewed-by: Christian Dresel --- src/packages/fff/fff-web/files/www/public/cgi-bin/status.html | 2 ++ src/packages/fff/fff-web/files/www/ssl/cgi-bin/header | 1 + src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html | 1 + 3 files changed, 4 insertions(+) diff --git a/src/packages/fff/fff-web/files/www/public/cgi-bin/status.html b/src/packages/fff/fff-web/files/www/public/cgi-bin/status.html index ae58260..f96846c 100755 --- a/src/packages/fff/fff-web/files/www/public/cgi-bin/status.html +++ b/src/packages/fff/fff-web/files/www/public/cgi-bin/status.html @@ -3,6 +3,7 @@ <% echo -en "Content-Type: text/html\r\n\r\n" HOSTNAME=$(uci -q get 'system.@system[0].hostname') +hood="$(uci -q get "system.@system[0].hood")" MAC="$(uci -q get network.mesh.macaddr)" lat="$(uci -q get system.@system[0].latitude)" @@ -59,6 +60,7 @@ contact="$(uci -q get system.@system[0].contact)"
Status + diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/header b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/header index 8df0ed0..c327013 100755 --- a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/header +++ b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/header @@ -13,6 +13,7 @@ nav_entry() { } HOSTNAME=$(uci -q get 'system.@system[0].hostname') +hood="$(uci -q get "system.@system[0].hood")" NOW=$(date +%s) #Check if new Firmware check older then 1 day diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html index b2529e1..45f59aa 100755 --- a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html +++ b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/home.html @@ -70,6 +70,7 @@ fi
Netz: Freifunk
Hood:<% echo "$hood" %>
Nachbarknoten:<% echo -n $(cat /sys/kernel/debug/batman_adv/bat0/originators | grep '^[0-9a-f]' | cut -b 37-53 | sort | uniq | wc -l 2> /dev/null) %>
Bekannte Knoten:<% echo -n $((`cat /sys/kernel/debug/batman_adv/bat0/transtable_global | grep '^ [^ ]' | cut -b 39-55 | sort | uniq | wc -l 2> /dev/null`+1)) %>
Lokale Clients:<% echo -n $(cat /sys/kernel/debug/batman_adv/bat0/transtable_local 2> /dev/null | grep -c 'W') %>
+
Hood:<% echo "$hood" %>
Nutzer:<% cat /sys/kernel/debug/batman_adv/bat0/transtable_local 2> /dev/null | grep -c 'W' %>
Empfangen:<% cat /sys/class/net/br-mesh/statistics/rx_bytes 2> /dev/null | human_bytes %>
Gesendet:<% cat /sys/class/net/br-mesh/statistics/tx_bytes 2> /dev/null | human_bytes %>