From 145e057a77468ed45cad8a658918f5f603b96886 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sun, 21 Jan 2018 13:53:02 +0100 Subject: [PATCH] fff-nodewatcher: Add detailed clients data This adds data about the clients per interface Signed-off-by: Adrian Schmutzler Tested-by: Adrian Schmutzler Tested-by: Christian Dresel Reviewed-by: Christian Dresel --- src/packages/fff/fff-nodewatcher/Makefile | 2 +- src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/packages/fff/fff-nodewatcher/Makefile b/src/packages/fff/fff-nodewatcher/Makefile index 8953a1e..273916b 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:=45 +PKG_VERSION:=46 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 b3c0046..195aea5 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="45" +SCRIPT_VERSION="46" test -f /tmp/started || exit @@ -259,10 +259,12 @@ crawl() { err "$(date): Collecting information about conected clients" #CLIENTS client_count=0 + dataclient="" CLIENT_INTERFACES=$(bridge link | awk '$2 !~/^bat/{ printf $2" " }') for clientif in ${CLIENT_INTERFACES}; do local cc=$(bridge fdb show br "$MESH_INTERFACE" brport "$clientif" | grep -v self | grep -v permanent -c) client_count=$((client_count + cc)) + dataclient="$dataclient<$clientif>$cc" done err "$(date): Putting all information into a XML-File and save it at $SCRIPT_DATA_FILE" @@ -275,6 +277,7 @@ crawl() { DATA=$DATA"$batman_adv_gateway_mode" DATA=$DATA"$batman_adv_gateway_list" DATA=$DATA"$client_count" + DATA=$DATA"$dataclient" DATA=$DATA"" #write data to xml file that provides the data on httpd