Browse Source

gluon-respondd: have respondd join ff05::... in addition to ff02::... (#1030)

Rework init script to additionally join a ff05::... multicast group on the mesh-wide interface.
Christof Schulze 7 years ago
parent
commit
718758f0e5
1 changed files with 3 additions and 9 deletions
  1. 3 9
      package/gluon-respondd/files/etc/init.d/gluon-respondd

+ 3 - 9
package/gluon-respondd/files/etc/init.d/gluon-respondd

@@ -9,17 +9,11 @@ MAXDELAY=10
 start_service() {
 	local ifdump="$(ubus call network.interface dump)"
 
-	local devs=''
-	local dev
-	for dev in $(echo "$ifdump" | jsonfilter -e "@.interface[@.proto='gluon_mesh' && @.up=true].device"); do
-		devs="$devs -i $dev"
-	done
-	for dev in $(echo "$ifdump" | jsonfilter -e "@.interface[@.interface='$(cat /lib/gluon/respondd/client.dev 2>/dev/null)' && @.up=true].device"); do
-		devs="$devs -i $dev -t $MAXDELAY"
-	done
+	local meshdevs=$(for dev in $(echo "$ifdump" | jsonfilter -e "@.interface[@.proto='gluon_mesh' && @.up=true].device"); do echo " -i $dev";done;)
+	local clientdevs=$(for dev in $(echo "$ifdump" | jsonfilter -e "@.interface[@.interface='$(cat /lib/gluon/respondd/client.dev 2>/dev/null)' && @.up=true].device"); do echo " -i $dev -t $MAXDELAY";done;)
 
 	procd_open_instance
-	procd_set_param command $DAEMON -g ff02::2:1001 -p 1001 -d /usr/lib/respondd -d /lib/gluon/respondd $devs
+	procd_set_param command $DAEMON -d /usr/lib/respondd -d /lib/gluon/respondd -p 1001 -g ff02::2:1001 $meshdevs $clientdevs -g ff05::2:1001 $clientdevs
 	procd_set_param respawn ${respawn_threshold:-3600} ${respawn_timeout:-5} ${respawn_retry:-5}
 	procd_set_param stderr 1
 	procd_close_instance