From 4ea38542c7722bdbe7d31ed208c4371498b63c1f Mon Sep 17 00:00:00 2001
From: Christof Schulze <christof.schulze@gmx.net>
Date: Fri, 25 Nov 2016 00:34:44 +0100
Subject: [PATCH] make respondd mesh-prtocol agnostic

---
 .../etc/hotplug.d/iface/10-gluon-respondd     | 26 +------------------
 .../files/etc/init.d/gluon-respondd           |  7 +++--
 2 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/package/gluon-respondd/files/etc/hotplug.d/iface/10-gluon-respondd b/package/gluon-respondd/files/etc/hotplug.d/iface/10-gluon-respondd
index 4f49be52..7fb5c7ba 100644
--- a/package/gluon-respondd/files/etc/hotplug.d/iface/10-gluon-respondd
+++ b/package/gluon-respondd/files/etc/hotplug.d/iface/10-gluon-respondd
@@ -1,34 +1,10 @@
 #!/bin/sh
 
-. /usr/share/libubox/jshn.sh
 . /lib/functions/service.sh
 
-DEVLIST=/var/run/gluon-respondd.devs
-
-ifname_to_dev () {
-	json_load "$(ubus call network.interface.$1 status)"
-	json_get_var dev device
-
-	echo "$dev"
-}
-
 case "$ACTION" in
-	ifdown)
-		sed "/ $INTERFACE$/d" $DEVLIST > $DEVLIST.new
-		mv $DEVLIST.new $DEVLIST
-		;;
+	ifdown) ;;
 	ifup)
-		DEVICE="$(ifname_to_dev "$INTERFACE")"
-		MESH="$(cat "/sys/class/net/$DEVICE/batman_adv/mesh_iface" 2>/dev/null)"
-
-		[ "$MESH" = "bat0" -o "$INTERFACE" = "client" ] || exit 0
-
-		DEVS=$(cat $DEVLIST 2>/dev/null; echo $DEVICE $INTERFACE)
-
-		echo "$DEVS" | sort -u > $DEVLIST.new
-		mv $DEVLIST.new $DEVLIST
-
 		/etc/init.d/gluon-respondd restart_if_running &
-
 		;;
 esac
diff --git a/package/gluon-respondd/files/etc/init.d/gluon-respondd b/package/gluon-respondd/files/etc/init.d/gluon-respondd
index a1bf979f..4099f690 100755
--- a/package/gluon-respondd/files/etc/init.d/gluon-respondd
+++ b/package/gluon-respondd/files/etc/init.d/gluon-respondd
@@ -7,13 +7,16 @@ START=50
 SERVICE_WRITE_PID=1
 SERVICE_DAEMONIZE=1
 
-DEVLIST=/var/run/gluon-respondd.devs
 DAEMON=/usr/bin/respondd
 LOCK=/var/run/gluon-respondd.lock
 
 
 do_start() {
-	DEVS=$(cat $DEVLIST 2>/dev/null | while read dev iface; do echo -n " -i $dev"; done)
+	DEVS=""
+	for dev in "$( ubus call network.interface dump | jsonfilter -e "@.interface[@.proto='gluon_mesh' && @.up=true].device") br-wan br-client"
+	do
+	  DEVS="$DEVS -i $dev"
+	done
 	service_start $DAEMON -g ff02::2:1001 -p 1001 -d /lib/gluon/respondd $DEVS
 }