From patchwork Mon Sep 30 20:12:17 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: nodewatcher: Add support for babel neighbours
From: Fabian Blaese <fabian@blaese.de>
X-Patchwork-Id: 1192
Message-Id: <20190930201217.1394447-2-fabian@blaese.de>
To: franken-dev@freifunk.net
Date: Mon, 30 Sep 2019 22:12:17 +0200

Signed-off-by: Fabian Bläse <fabian@blaese.de>
Reviewed-by: Christian Dresel <fff@chrisi01.de>
Reviewed-by: Robert Langhammer <rlanghammer@web.de>
---
 .../fff/fff-nodewatcher/files/usr/sbin/nodewatcher | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
index 0d4ef80..bf650ad 100755
--- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
+++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
@@ -286,6 +286,19 @@ crawl() {
         dataair="$dataair<airtime5><active>$w5_ACT</active><busy>$w5_BUS</busy></airtime5>"
     fi
 
+    if pgrep babeld >/dev/null; then
+        neighbours="$(echo dump | nc ::1 33123 | grep '^add neighbour' |
+            awk '{
+                   for (i=2; i < NF; i += 2) {
+                     vars[$i] = $(i+1)
+                   }
+                 }
+                 {
+                   printf "<neighbour><ip>%s</ip><outgoing_interface>%s</outgoing_interface><link_cost>%s</link_cost></neighbour>", vars["address"], vars["if"], vars["cost"]
+                 }')"
+        BABELS="<babel_neighbours>$neighbours</babel_neighbours>"
+    fi
+
     err "$(date): Putting all information into a XML-File and save it at $SCRIPT_DATA_FILE"
 
     DATA="<?xml version='1.0' standalone='yes'?><data>"
@@ -295,6 +308,7 @@ crawl() {
     DATA=$DATA"<batman_adv_originators>$batman_adv_originators</batman_adv_originators>"
     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"$BABELS"
     DATA=$DATA"<client_count>$client_count</client_count>"
     DATA=$DATA"<clients>$dataclient</clients>"
     DATA=$DATA"$dataair"