[PATCH] Always send hood to Monitoring

[mail at adrianschmutzler.de]

Applied.

> -----Original Message-----
> From: Tim Niemeyer [mailto:tim at tn-x.org]
> Sent: Montag, 12. November 2018 20:18
> To: Adrian Schmutzler <freifunk at adrianschmutzler.de>; franken-
> dev at freifunk.net
> Subject: Re: [PATCH] Always send hood to Monitoring
> 
> Sieht gut aus
> 
> Reviewed-by: Tim Niemeyer <tim at tn-x.org>
> 
> Tim
> 
> Am 12. November 2018 20:12:34 MEZ schrieb Adrian Schmutzler
> <freifunk at adrianschmutzler.de>:
> >Since the MacNocker was introduced, the hood information in UCI is
> >DELETED if the hood is lost.
> >
> >If the router still successfully sends alfred data in this state, the
> >Monitoring will treat it as a V1 device. This is annoying, especially
> >since it looks like a loop.
> >
> >An easy solution is to send an empty <hood> field in those cases, as V2
> >routers are detected by them knowing their hood.
> >
> >Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
> >---
> > src/packages/fff/fff-nodewatcher/Makefile                   | 2 +-
> >src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher | 7 ++-----
> > 2 files changed, 3 insertions(+), 6 deletions(-)
> >
> >diff --git a/src/packages/fff/fff-nodewatcher/Makefile
> >b/src/packages/fff/fff-nodewatcher/Makefile
> >index 7f989fdb..927c6293 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:=49
> >+PKG_VERSION:=50
> > 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 b0b67e1a..9ca336e9 100755
> >--- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> >+++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> >@@ -12,7 +12,7 @@ if ! lock -n "$lockfile"; then  fi  trap "lock -u
> >\"$lockfile\"" INT TERM EXIT
> >
> >-SCRIPT_VERSION="49"
> >+SCRIPT_VERSION="50"
> >
> > #Get the configuration from the uci configuration file #If it does not
> >exists, then get it from a normal bash file with variables.
> >@@ -146,10 +146,7 @@ crawl() {
> >     SYSTEM_DATA=$SYSTEM_DATA"${geo}"
> >     SYSTEM_DATA=$SYSTEM_DATA"${position_comment}"
> >     SYSTEM_DATA=$SYSTEM_DATA"${contact}"
> >-    if [ "$(uci -q get "system. at system[0].hood")" ]
> >-    then
> >-        SYSTEM_DATA=$SYSTEM_DATA"<hood>$(uci -q get
> >"system. at system[0].hood")</hood>"
> >-    fi
> >+    SYSTEM_DATA=$SYSTEM_DATA"<hood>$(uci -q get
> >"system. at system[0].hood")</hood>"
> >     SYSTEM_DATA=$SYSTEM_DATA"<distname>$distname</distname>"
> >
> SYSTEM_DATA=$SYSTEM_DATA"<distversion>$distversion</distversion>"
> >     SYSTEM_DATA=$SYSTEM_DATA"$cpu"
-------------- nächster Teil --------------
Ein Dateianhang mit Binärdaten wurde abgetrennt...
Dateiname   : nicht verfügbar
Dateityp    : application/pgp-signature
Dateigröße  : 834 bytes
Beschreibung: nicht verfügbar
URL         : <http://lists.freifunk.net/pipermail/franken-dev-freifunk.net/attachments/20181121/85fa0391/attachment.sig>