diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/helpers b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/helpers index 528fcd4d6d611510c47f870a1a1773328859a98e..5e0196c559779ca28085cc61e022d8112a467503 100755 --- a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/helpers +++ b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/helpers @@ -3,15 +3,16 @@ <% human_bytes() { while read B ; do - [ $B -lt 1024 ] && echo ${B} B && break + [ $B -lt 1024 ] && echo ${B} B && return KB=$(((B+512)/1024)) - [ $KB -lt 1024 ] && echo ${KB} KB && break + [ $KB -lt 1024 ] && echo ${KB} KB && return MB=$(((KB+512)/1024)) - [ $MB -lt 1024 ] && echo ${MB} MB && break + [ $MB -lt 1024 ] && echo ${MB} MB && return GB=$(((MB+512)/1024)) - [ $GB -lt 1024 ] && echo ${GB} GB && break - echo $(((GB+512)/1024)) TB + [ $GB -lt 1024 ] && echo ${GB} GB && return + echo $(((GB+512)/1024)) TB && return done + echo "-" } show_msg() { 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 78a83e5f6e5780b343657fe0d7ad15a92d899570..b2529e14ed61344f9da5144a7b6b962b6326257c 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 @@ -71,8 +71,8 @@ fi <legend>Netz: Freifunk</legend> <table> <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 | human_bytes %></td></tr> - <tr><th>Gesendet:</th><td><% cat /sys/class/net/br-mesh/statistics/tx_bytes | human_bytes %></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> <tr><th>IPv4 Adressen:</th><td><% addr 4 br-mesh %></td></tr> <tr><th>IPv6 Adressen:</th><td><% addr 6 br-mesh %></td></tr> </table> @@ -82,8 +82,8 @@ fi <legend>Netz: WAN</legend> <table> <tr><th>Internet vorhanden:</th><td><%= ${internet_active} %></td></tr> - <tr><th>Empfangen:</th><td><% cat /sys/class/net/${wanif}/statistics/rx_bytes | human_bytes %></td></tr> - <tr><th>Gesendet:</th><td><% cat /sys/class/net/${wanif}/statistics/tx_bytes | human_bytes %></td></tr> + <tr><th>Empfangen:</th><td><% cat /sys/class/net/${wanif}/statistics/rx_bytes 2> /dev/null | human_bytes %></td></tr> + <tr><th>Gesendet:</th><td><% cat /sys/class/net/${wanif}/statistics/tx_bytes 2> /dev/null | human_bytes %></td></tr> <tr><th>IPv4 Adressen:</th><td><% addr 4 $wanif %></td></tr> <tr><th>IPv6 Adressen:</th><td><% addr 6 $wanif %></td></tr> </table>