[PATCH] fff-nodewatcher: Add detailed clients data

Tim Niemeyer tim at tn-x.org
So Jan 21 14:55:50 CET 2018


Hi

Und applied.

Tim

Am Sonntag, den 21.01.2018, 14:15 +0100 schrieb Christian Dresel:
> hi
> 
> danke für die Arbeit
> 
> Tested-by: Christian Dresel <fff at chrisi01.de>
> Reviewed-by: Christian Dresel <fff at chrisi01.de>
> 
> mfg
> 
> Christian
> 
> On 21.01.2018 13:53, Adrian Schmutzler wrote:
> > This adds data about the clients per interface
> > 
> > Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
> > 
> > Tested-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
> > ---
> >  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</$clientif>"
> >      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>$batman_adv_gateway_mode</
> > batman_adv_gateway_mode>"
> >      DATA=$DATA"<batman_adv_gateway_list>$batman_adv_gateway_list</
> > batman_adv_gateway_list>"
> >      DATA=$DATA"<client_count>$client_count</client_count>"
> > +    DATA=$DATA"<clients>$dataclient</clients>"
> >      DATA=$DATA"</data>"
> >  
> >      #write data to xml file that provides the data on httpd
> > 
> 
> 
-------------- nächster Teil --------------
Ein Dateianhang mit Binärdaten wurde abgetrennt...
Dateiname   : signature.asc
Dateityp    : application/pgp-signature
Dateigröße  : 488 bytes
Beschreibung: This is a digitally signed message part
URL         : <http://lists.freifunk.net/pipermail/franken-dev-freifunk.net/attachments/20180121/eeaa79f0/attachment.sig>


Mehr Informationen über die Mailingliste franken-dev