From b70d4ce20a989aaf030e989775852f1c057b3290 Mon Sep 17 00:00:00 2001
From: Christof Schulze <christof.schulze@gmx.net>
Date: Sat, 14 Apr 2018 23:44:39 +0200
Subject: [PATCH] gluon-core, gluon-l3roamd: introduce script
gluon-list-mesh-interfaces that lists all currently active mesh interfaces
---
package/gluon-core/files/usr/bin/gluon-list-mesh-interfaces | 2 ++
package/gluon-l3roamd/files/etc/init.d/gluon-l3roamd | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
create mode 100755 package/gluon-core/files/usr/bin/gluon-list-mesh-interfaces
diff --git a/package/gluon-core/files/usr/bin/gluon-list-mesh-interfaces b/package/gluon-core/files/usr/bin/gluon-list-mesh-interfaces
new file mode 100755
index 000000000..9b450f900
--- /dev/null
+++ b/package/gluon-core/files/usr/bin/gluon-list-mesh-interfaces
@@ -0,0 +1,2 @@
+#!/bin/sh
+ubus call network.interface dump | jsonfilter -e "@.interface[@.proto='gluon_mesh' && @.up=true].device"
diff --git a/package/gluon-l3roamd/files/etc/init.d/gluon-l3roamd b/package/gluon-l3roamd/files/etc/init.d/gluon-l3roamd
index 0a51bde94..9fe597b99 100755
--- a/package/gluon-l3roamd/files/etc/init.d/gluon-l3roamd
+++ b/package/gluon-l3roamd/files/etc/init.d/gluon-l3roamd
@@ -10,7 +10,7 @@ start_service () {
procd_set_param stdout 1
procd_set_param stderr 1
procd_set_param respawn ${respawn_threshold:-3660} ${respawn_timeout:-5} ${respawn_retry:-0}
- interfaces=$(for dev in $( ubus call network.interface dump | jsonfilter -e "@.interface[@.proto='gluon_mesh' && @.up=true].device");do echo " -m $dev"; done;
+ interfaces=$(for dev in $(gluon-list-mesh-interfaces);do echo " -m $dev"; done;
[ "$(ifstatus client | jsonfilter -e "@.up")" = "true" ] && echo " -i local-node")
procd_set_param command "$PROG" -s /var/run/l3roamd.sock -p $(lua -e 'print(require("gluon.site").prefix6())') $interfaces -t 254 -a $(uci get network.loopback.ip6addr | cut -d/ -f1) -4 0:0:0:0:0:ffff::/96 -b br-client
procd_close_instance
--
GitLab