bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

batman-adv: hotplug script fixes

Browse Source 
* 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@30457 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
marek 2012-02-11 18:15:36 +00:00
parent dcb18904da
commit 5cf2f3b3b0
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/batman-adv/files/etc/hotplug.d/net/99-batman-adv
View File

@ -6,7 +6,7 @@ config_load batman-adv
case "$ACTION" in case "$ACTION" in
add) 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" [ -d /sys/class/net/$INTERFACE/batman_adv/ ] && config_foreach bat_add_interface mesh "$INTERFACE"
;; ;;
remove) remove)

3
net/batman-adv/files/lib/batman-adv/config.sh
View File

@ -14,6 +14,7 @@ bat_config(){
config_get orig_interval "$mesh" orig_interval config_get orig_interval "$mesh" orig_interval
config_get hop_penalty "$mesh" hop_penalty config_get hop_penalty "$mesh" hop_penalty
config_get vis_mode "$mesh" vis_mode 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 "$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 [ -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_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 "$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 "$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(){ bat_add_interface(){

15
net/batman-adv/files/usr/sbin/batman-adv
View File

@ -1,6 +1,7 @@
#!/bin/sh /etc/rc.common #!/bin/sh
# Copyright (C) 2011 OpenWrt.org # Copyright (C) 2011 OpenWrt.org
. /etc/functions.sh
. /lib/batman-adv/config.sh . /lib/batman-adv/config.sh
start_mesh() { start_mesh() {
@ -44,3 +45,15 @@ stop () {
config_foreach stop_mesh mesh config_foreach stop_mesh mesh
fi 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