From 20ea0c6d8e4fa7007f1493193e701107de419ae0 Mon Sep 17 00:00:00 2001
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Tue, 30 May 2017 22:11:43 +0200
Subject: [PATCH] fff-nodewatcher: write WAN status to XML (fastd and L2TP)

Fixes #30

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Reviewed-by: Tobias Klaus <tk+ff@meskal.net>

deleted some trailing whitespaces
Signed-off-by: Tobias Klaus <tk+ff@meskal.net>
---
 .../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..930463a 100755
--- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
+++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
@@ -103,6 +103,13 @@ crawl() {
         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"
     #DISTRIB_RELEASE="Attitude Adjustment"
@@ -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"