batman-adv: hotplug script fixes

 * call bat_config() instead of config_bat() (which does not exist)
 * support ap isolation config option
 * remove /etc/rc.common from script since it is not an init script anymore

Signed-off-by: Filippo Sallemi <tonyputi@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/packages/net/batman-adv@30457 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/files/etc/hotplug.d/net/99-batman-adv b/files/etc/hotplug.d/net/99-batman-adv
index 2ad83cf4e69770e778a2b571f5ab2751839286e4..fe19e6470af981b367123fe3de8eedcac2a2589b 100644 (file)
--- a/files/etc/hotplug.d/net/99-batman-adv
+++ b/files/etc/hotplug.d/net/99-batman-adv
@@ -6,7 +6,7 @@ config_load batman-adv
 
 case "$ACTION" in
        add)
-               [ -d /sys/class/net/$INTERFACE/mesh/ ] && config_bat "$INTERFACE"
+               [ -d /sys/class/net/$INTERFACE/mesh/ ] && bat_config "$INTERFACE"
                [ -d /sys/class/net/$INTERFACE/batman_adv/ ] && config_foreach bat_add_interface mesh "$INTERFACE"
                ;;
        remove)

diff --git a/files/lib/batman-adv/config.sh b/files/lib/batman-adv/config.sh
index d0569bc77dfed0a25ff3e43de590d58c8a9aa053..044c2f64bca92e7511187a9c9d26d78c9546697c 100644 (file)
--- a/files/lib/batman-adv/config.sh
+++ b/files/lib/batman-adv/config.sh
@@ -14,6 +14,7 @@ bat_config(){
        config_get orig_interval "$mesh" orig_interval
        config_get hop_penalty "$mesh" hop_penalty
        config_get vis_mode "$mesh" vis_mode
+       config_get ap_isolation "$mesh" ap_isolation
 
        [ -n "$orig_interval" ] && echo $orig_interval > /sys/class/net/$mesh/mesh/orig_interval
        [ -n "$hop_penalty" ] && echo $hop_penalty > /sys/class/net/$mesh/mesh/hop_penalty
@@ -25,6 +26,8 @@ bat_config(){
        [ -n "$gw_mode" ] && echo $gw_mode > /sys/class/net/$mesh/mesh/gw_mode
        [ -n "$gw_sel_class" ] && echo $gw_sel_class > /sys/class/net/$mesh/mesh/gw_sel_class
        [ -n "$vis_mode" ] && echo $vis_mode > /sys/class/net/$mesh/mesh/vis_mode
+       [ -n "$ap_isolation" ] && echo $ap_isolation > /sys/class/net/$mesh/mesh/ap_isolation
+       
 }
 
 bat_add_interface(){

diff --git a/files/usr/sbin/batman-adv b/files/usr/sbin/batman-adv
index 4f1799171171a62aa40bc2813ea3c54962146ac4..6580756ab44bc7929cd2835c9fbc0f762df8eeca 100644 (file)
--- a/files/usr/sbin/batman-adv
+++ b/files/usr/sbin/batman-adv
@@ -1,6 +1,7 @@
-#!/bin/sh /etc/rc.common
+#!/bin/sh
 # Copyright (C) 2011 OpenWrt.org
 
+. /etc/functions.sh
 . /lib/batman-adv/config.sh
 
 start_mesh() {
@@ -44,3 +45,15 @@ stop () {
                config_foreach stop_mesh mesh
        fi
 }
+
+restart() {
+       stop $1
+       start $1
+}
+
+case "$1" in
+       start) start $2 ;;
+       stop) stop $2 ;;
+       restart) restart $2 ;;
+       *) echo "Usage: batman-adv <start|stop|restart> [mesh instance]"
+esac