From patchwork Sat Feb 10 15:33:59 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: nodewatcher: Provide data about traffic control
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
X-Patchwork-Id: 775
Message-Id: <1518276839-2408-1-git-send-email-freifunk@adrianschmutzler.de>
To: franken-dev@freifunk.net
Date: Sat, 10 Feb 2018 16:33:59 +0100

With this data, the Monitoring can show whether traffic control is
enabled and which rates are set.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

Tested-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
 src/packages/fff/fff-nodewatcher/Makefile          |  2 +-
 .../fff/fff-nodewatcher/files/usr/sbin/nodewatcher | 22 +++++++++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/packages/fff/fff-nodewatcher/Makefile b/src/packages/fff/fff-nodewatcher/Makefile
index 11a0cb6..9d9cb28 100644
--- a/src/packages/fff/fff-nodewatcher/Makefile
+++ b/src/packages/fff/fff-nodewatcher/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-nodewatcher
-PKG_VERSION:=47
+PKG_VERSION:=48
 PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
diff --git a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
index 3b60500..c73415a 100755
--- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
+++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
@@ -2,7 +2,7 @@
 # Netmon Nodewatcher (C) 2010-2012 Freifunk Oldenburg
 # License; GPL v3
 
-SCRIPT_VERSION="47"
+SCRIPT_VERSION="48"
 
 test -f /tmp/started || exit
 
@@ -280,6 +280,25 @@ crawl() {
         w5_BUS="$(BUSY=$(echo "$w5dump" | grep "busy time:"); set ${BUSY:-0 0 0 0 0}; echo -e "${4}")"
         dataair="$dataair<airtime5><active>$w5_ACT</active><busy>$w5_BUS</busy></airtime5>"
     fi
+	
+	# simple-tc information
+	. /lib/functions.sh
+	config_load simple-tc
+	tc_enabled="0"
+	tc_in="0"
+	tc_out="0"
+	parseTcInterface() {
+		local iface="$1"
+		
+		config_get ifname "$iface" ifname
+		[ "wan" = "$ifname" ] || return
+
+		config_get tc_enabled "$iface" enabled "0"
+		config_get tc_in "$iface" limit_ingress "0"
+		config_get tc_out "$iface" limit_egress "0"
+	}
+	config_foreach parseTcInterface 'interface'
+    traffic_control="<traffic_control><wan><enabled>$tc_enabled</enabled><in>$tc_in</in><out>$tc_out</out></wan></traffic_control>"
 
     err "$(date): Putting all information into a XML-File and save it at $SCRIPT_DATA_FILE"
 
@@ -293,6 +312,7 @@ crawl() {
     DATA=$DATA"<client_count>$client_count</client_count>"
     DATA=$DATA"<clients>$dataclient</clients>"
     DATA=$DATA"$dataair"
+    DATA=$DATA"$traffic_control"
     DATA=$DATA"</data>"
 
     #write data to xml file that provides the data on httpd