nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gluon-respondd: make initialisation mesh protocol agnostic (#946)

Browse Source
This commit is contained in:
Christof Schulze 2016-12-08 17:44:29 +01:00 committed by Matthias Schiffer
parent 5559ee9cf6
commit 6af96a88ad
No known key found for this signature in database
GPG Key ID: 16EF3F64CB201D9C
4 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/gluon-mesh-batman-adv-core/files/lib/gluon/respondd/client.dev Normal file
View File

@ -0,0 +1 @@
br-client

24
package/gluon-respondd/files/etc/hotplug.d/iface/10-gluon-respondd
View File

@ -1,34 +1,16 @@
#!/bin/sh #!/bin/sh
. /usr/share/libubox/jshn.sh
. /lib/functions/service.sh . /lib/functions/service.sh
DEVLIST=/var/run/gluon-respondd.devs
ifname_to_dev () { ifname_to_dev () {
json_load "$(ubus call network.interface.$1 status)" ifstatus client "$1"|jsonfilter -e "@.device"
json_get_var dev device
echo "$dev"
} }
case "$ACTION" in case "$ACTION" in
ifdown)
sed "/ $INTERFACE$/d" $DEVLIST > $DEVLIST.new
mv $DEVLIST.new $DEVLIST
;;
ifup) ifup)
DEVICE="$(ifname_to_dev "$INTERFACE")" 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 &
[ "$DEVICE" != "$(cat /lib/gluon/respondd/client.dev 2>/dev/null)" ] ||
/etc/init.d/gluon-respondd restart_if_running &
;; ;;
esac esac

7
package/gluon-respondd/files/etc/init.d/gluon-respondd
View File

@ -7,13 +7,16 @@ START=50
SERVICE_WRITE_PID=1 SERVICE_WRITE_PID=1
SERVICE_DAEMONIZE=1 SERVICE_DAEMONIZE=1
DEVLIST=/var/run/gluon-respondd.devs
DAEMON=/usr/bin/respondd DAEMON=/usr/bin/respondd
LOCK=/var/run/gluon-respondd.lock LOCK=/var/run/gluon-respondd.lock
do_start() { 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") $(cat /lib/gluon/respondd/client.dev 2>/dev/null)
do
DEVS="$DEVS -i $dev"
done
service_start $DAEMON -g ff02::2:1001 -p 1001 -d /lib/gluon/respondd $DEVS service_start $DAEMON -g ff02::2:1001 -p 1001 -d /lib/gluon/respondd $DEVS
} }

2
package/gluon-respondd/files/lib/gluon/core/mesh/setup.d/10-gluon-respondd Executable file
View File

@ -0,0 +1,2 @@
#!/bin/sh
/etc/init.d/gluon-respondd restart_if_running &