[PATCH] fff-web: Show hood in public and internal web interface

[mail at adrianschmutzler.de]

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

> -----Original Message-----
> From: franken-dev [mailto:franken-dev-bounces at freifunk.net] On Behalf
> Of Adrian Schmutzler
> Sent: Freitag, 6. Oktober 2017 23:33
> To: franken-dev at freifunk.net
> Subject: [PATCH] fff-web: Show hood in public and internal web interface
> 
> Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
> ---
>  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. at system[0].hostname')
> +hood="$(uci -q get "system. at system[0].hood")"
> 
>  MAC="$(uci -q get network.mesh.macaddr)"
>  lat="$(uci -q get system. at system[0].latitude)"
> @@ -59,6 +60,7 @@ contact="$(uci -q get system. at system[0].contact)"
>  						<fieldset style="min-height:
> 15em;">
> 
> 	<legend>Status</legend>
>  							<table>
> +
> 	<tr><th>Hood:</th><td><% echo "$hood" %></td></tr>
> 
> 	<tr><th>Nachbarknoten:</th><td><% 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) %></td></tr>
> 
> 	<tr><th>Bekannte Knoten:</th><td><% echo -n $((`cat
> /sys/kernel/debug/batman_adv/bat0/transtable_global | grep '^ [^ ]' | cut
-
> b 39-55 | sort | uniq | wc -l 2> /dev/null`+1)) %></td></tr>
>
<tr><th>Lokale
> Clients:</th><td><% echo -n $(cat
> /sys/kernel/debug/batman_adv/bat0/transtable_local 2> /dev/null | grep -c
> 'W') %></td></tr> 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. at system[0].hostname')
> +hood="$(uci -q get "system. at 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
>  <fieldset style="min-height: 12.65em;">
>  	<legend>Netz: Freifunk</legend>
>  	<table>
> +		<tr><th>Hood:</th><td><% echo "$hood" %></td></tr>
>  		<tr><th>Nutzer:</th><td><% cat
> /sys/kernel/debug/batman_adv/bat0/transtable_local 2> /dev/null | grep -c
> 'W' %></td></tr>
>  		<tr><th>Empfangen:</th><td><% cat /sys/class/net/br-
> mesh/statistics/rx_bytes 2> /dev/null | human_bytes %></td></tr>
>  		<tr><th>Gesendet:</th><td><% cat /sys/class/net/br-
> mesh/statistics/tx_bytes 2> /dev/null | human_bytes %></td></tr>
> --
> 2.7.4
> 
> --
> franken-dev mailing list
> franken-dev at freifunk.net
> http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net