From patchwork Tue May 30 20:11:43 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [8/8] fff-nodewatcher: write WAN status to XML (fastd and L2TP)
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
X-Patchwork-Id: 346
Message-Id: <1496175103-1031-1-git-send-email-freifunk@adrianschmutzler.de>
To: franken-dev@freifunk.net
Cc: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Tue, 30 May 2017 22:11:43 +0200

Fixes #30

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Reviewed-by: Tobias Klaus <tk+ff@meskal.net>
---
 src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
index d5e3ce5..e7acd01 100755
--- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
+++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
@@ -102,6 +102,13 @@ crawl() {
     if [ -f "$SCRIPT_STATUS_FILE" ]; then
         status_text="<status_text>$(cat "$SCRIPT_STATUS_FILE")</status_text>"
     fi
+    
+    #Checks whether either fastd or L2TP is connected
+    if [ pidof fastd >/dev/null ] || [ grep -q '1' /sys/class/net/l2tp*/carrier ] ; then
+        vpn_active="<vpn_active>1</vpn_active>"
+    else
+        vpn_active="<vpn_active>0</vpn_active>"
+    fi
 
     # example for /etc/openwrt_release:
     #DISTRIB_ID="OpenWrt"
@@ -145,6 +152,7 @@ crawl() {
     SYSTEM_DATA=$SYSTEM_DATA"<firmware_revision>$BUILD_DATE</firmware_revision>"
     SYSTEM_DATA=$SYSTEM_DATA"<openwrt_core_revision>$OPENWRT_CORE_REVISION</openwrt_core_revision>"
     SYSTEM_DATA=$SYSTEM_DATA"<openwrt_feeds_packages_revision>$OPENWRT_FEEDS_PACKAGES_REVISION</openwrt_feeds_packages_revision>"
+    SYSTEM_DATA=$SYSTEM_DATA"$vpn_active"
 
     err "$(date): Collecting information from network interfaces"