diff --git a/src/packages/fff/fff-layer3/Makefile b/src/packages/fff/fff-layer3/Makefile index ce3d2002..9b91e4cc 100644 --- a/src/packages/fff/fff-layer3/Makefile +++ b/src/packages/fff/fff-layer3/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-layer3 -PKG_RELEASE:=8 +PKG_RELEASE:=9 include $(INCLUDE_DIR)/package.mk diff --git a/src/packages/fff/fff-layer3/files/www/ssl/cgi-bin/home.html b/src/packages/fff/fff-layer3/files/www/ssl/cgi-bin/home.html new file mode 100755 index 00000000..af2edc2d --- /dev/null +++ b/src/packages/fff/fff-layer3/files/www/ssl/cgi-bin/home.html @@ -0,0 +1,78 @@ +#!/usr/bin/haserl + +<%in /www/include/header %> +<%in /www/include/helpers %> +<% show_msg %> +<% + +up="$(uptime)" +load="${up##*:}" +uptime="${up%%,*}" +uptime="${uptime##*up}" + +#include OpenWrt version +. /etc/openwrt_release +. /etc/firmware_release + +addr() { + local addr="$(ip -$1 address show dev $2 2>/dev/null | tr '/' ' '| awk '/inet/{ printf("%s
", $2); }')" + echo "${addr:--}" +} +default_gw() { + ip -$1 route list 0/0 dev $2 2> /dev/null | awk '{print($3); exit(0)}' +} +wanif=$(uci -q get network.wan.ifname) +if [ -n "$(default_gw 4 $wanif)" -o -n "$(default_gw 6 $wanif)" ]; then + internet_active="Ja" +else + internet_active="Nein" +fi + +%> + + +
+
+ System + + + + + + + +
Name:<%= ${HOSTNAME} %>
Modell:<% cat /tmp/sysinfo/model 2>/dev/null %>
MAC-Adresse:<%= $(cat /sys/class/net/br-client/address) %>
Laufzeit:<%= ${uptime} %>
Auslastung:<%= ${load} %>
Uhrzeit:<% date %>
+
+
+ Netz: Freifunk + + + + + +
Empfangen:<% cat /sys/class/net/br-client/statistics/rx_bytes 2> /dev/null | human_bytes %>
Gesendet:<% cat /sys/class/net/br-client/statistics/tx_bytes 2> /dev/null | human_bytes %>
IPv4 Adressen:<% addr 4 br-client %>
IPv6 Adressen:<% addr 6 br-client %>
+
+
+
+ Software + + + + +
Firmware Version:<%= ${FIRMWARE_VERSION} %>
OpenWrt Version:<%= ${DISTRIB_DESCRIPTION} %>
Kernel Version:<% uname -s -m -r %>
+
+
+
+
+ Netz: WAN + + + + + + +
Internet vorhanden:<%= ${internet_active} %>
Empfangen:<% cat /sys/class/net/${wanif}/statistics/rx_bytes 2> /dev/null | human_bytes %>
Gesendet:<% cat /sys/class/net/${wanif}/statistics/tx_bytes 2> /dev/null | human_bytes %>
IPv4 Adressen:<% addr 4 $wanif %>
IPv6 Adressen:<% addr 6 $wanif %>
+
+
+ +<%in /www/include/footer %> diff --git a/src/packages/fff/fff-node/Makefile b/src/packages/fff/fff-node/Makefile index 6a6a6392..cfb1fb45 100644 --- a/src/packages/fff/fff-node/Makefile +++ b/src/packages/fff/fff-node/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-node -PKG_RELEASE:=3 +PKG_RELEASE:=4 include $(INCLUDE_DIR)/package.mk diff --git a/src/packages/fff/fff-web-ui/files/www/ssl/cgi-bin/home.html b/src/packages/fff/fff-node/files/www/ssl/cgi-bin/home.html similarity index 100% rename from src/packages/fff/fff-web-ui/files/www/ssl/cgi-bin/home.html rename to src/packages/fff/fff-node/files/www/ssl/cgi-bin/home.html diff --git a/src/packages/fff/fff-web-ui/Makefile b/src/packages/fff/fff-web-ui/Makefile index 3dee4786..c99a2823 100644 --- a/src/packages/fff/fff-web-ui/Makefile +++ b/src/packages/fff/fff-web-ui/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-web-ui -PKG_RELEASE:=17 +PKG_RELEASE:=18 include $(INCLUDE_DIR)/package.mk