[package] babeld: update to 0.98, fix scripts

[openwrt/svn-archive/archive.git] / net / babel / files / babeld.init

diff --git a/net/babel/files/babeld.init b/net/babel/files/babeld.init
index 12fa90e2e87b30d08cd2fcc3dd8617c1f03b3aa8..67c78ffe29e24d0ed246593b1178d8340d03a6d9 100755 (executable)
--- a/net/babel/files/babeld.init
+++ b/net/babel/files/babeld.init
@@ -2,37 +2,137 @@
 
 START=70
 
+PID_F='/var/run/babeld.pid'
+EXTRA_COMMANDS="status"
+EXTRA_HELP="        status Dump Babel's table to the log file."
+
+listen_ifname() {
+       local name="$1"
+       local switch="$2"
+       local _uciname=`uci get -q -P /var/state network.$name.ifname`
+       append args "$switch ${_uciname:-$name}"
+       append interfaces "${_uciname:-$name}"
+}
+
+append_ifname() {
+       local section="$1"
+       local option="$2"
+       local switch="$3"
+       local _name
+       config_get _name "$section" "$option"
+       [ -z "$name" ] && return 0
+       local _uciname=`uci get -q -P /var/state network.$_name.ifname`
+       append args "$switch ${_uciname:-$_name}"
+}
+
+append_bool() {
+       local section="$1"
+       local option="$2"
+       local value="$3"
+       local _loctmp
+       config_get_bool _loctmp "$section" "$option"
+       [ "$_loctmp" -gt 0 ] && append args "$value"
+}
+
+append_parm() {
+       local section="$1"
+       local option="$2"
+       local switch="$3"
+       local _loctmp
+       config_get _loctmp "$section" "$option"
+       [ -z "$_loctmp" ] && return 0
+       append args "$switch $_loctmp"
+}
+
+babel_filter() {
+       local cfg="$1"
+       local _loctmp
+
+       local _ignored
+       config_get_bool _ignored "$cfg" 'ignore' 0
+       [ "$_ignored" -eq 1 ] && return 0
+       
+       append args "-C '"
+
+       append_parm "$cfg" 'type' ''
+
+       append_parm "$cfg" 'ip' 'ip'
+       append_parm "$cfg" 'le' 'le'
+       append_parm "$cfg" 'ge' 'ge'
+       append_parm "$cfg" 'neigh' 'neigh'
+       append_parm "$cfg" 'id' 'id'
+       append_parm "$cfg" 'proto' 'proto'
+
+       append_ifname "$cfg" 'if' 'if'
+
+       append_bool "$cfg" 'local' 'local'
+
+       append args ' ' "'"
+}
+
 babel_addif() {
-       config_get ifname $1 ifname
-       append interfaces "$ifname"
+       local cfg="$1"
+
+       local _ignored
+       config_get_bool _ignored "$cfg" 'ignore' 0
+       [ "$_ignored" -eq 1 ] && return 0
+       
+       listen_ifname "$cfg" "-C 'interface"
+
+       append_parm "$cfg" 'wired' 'wired'
+       append_parm "$cfg" 'link_quality' 'link-quality'
+       append_parm "$cfg" 'split_horizon' 'split-horizon'
+       append_parm "$cfg" 'rxcost' 'rxcost'
+       append_parm "$cfg" 'hello_interval' 'hello-interval'
+       append_parm "$cfg" 'update_interval' 'update-interval'
+
+       append args ' ' "'"
 }
 
 babel_config() {
        local cfg="$1"
-       interfaces=
-       config_list_foreach "$cfg" interface babel_addif
-       pidfile=/var/run/babeld-"$cfg".pid
-       [ -z "$interfaces" ] && return 0
-       if [ -e $pidfile ] ; then
-               echo "$pidfile exists -- not starting babel." >&2
-       else
-               /usr/sbin/babeld -D -I $pidfile $interfaces
-       fi
+
+       append_bool "$cfg" 'carrier_sense' '-l'
+       append_bool "$cfg" 'assume_wireless' '-w'
+       append_bool "$cfg" 'no_split_horizon' '-s'
+       append_bool "$cfg" 'parasitic' '-P'
+
+       append_parm "$cfg" 'multicast_address' '-m'
+       append_parm "$cfg" 'port' '-p'
+       append_parm "$cfg" 'state_file' '-S'
+       append_parm "$cfg" 'hello_interval' '-h'
+       append_parm "$cfg" 'wired_hello_interval' '-H'
+       append_parm "$cfg" 'idle_hello_interval' '-i'
+       append_parm "$cfg" 'kernel_priority' '-k'
+       append_parm "$cfg" 'duplication_priority' '-A'
+       append_parm "$cfg" 'debug' '-d'
+       append_parm "$cfg" 'local_server' '-g'
+       append_parm "$cfg" 'export_table' '-t'
+       append_parm "$cfg" 'import_table' '-T'
+       append_parm "$cfg" 'conf_file' '-c'
+       append_parm "$cfg" 'log_file' '-L'
 }
 
 start() {
-       if [ -x /etc/init.d/ahcpd ] && /etc/init.d/ahcpd enabled; then
-               echo 'Not starting babel -- will be started by ahcpd.'
-               exit 0
-       fi
-       include /lib/network
-       scan_interfaces
-       config_load babel
        mkdir -p /var/lib
-       config_foreach babel_config babel
+       config_load babeld
+       unset args
+       unset interfaces
+       config_foreach babel_config general
+       config_foreach babel_addif interface
+       config_foreach babel_filter filter
+       [ -z "$interfaces" ] && return 0
+       eval "/usr/sbin/babeld -D -I $PID_F $args $interfaces"
 }
 
 stop() {
-       kill $(cat /var/run/babeld-*.pid)
-       rm -f /var/run/babeld-*.pid
+       [ -f $PID_F ] && kill $(cat $PID_F)
+}
+
+status() {
+       [ -f $PID_F ] && kill -USR1 $(cat $PID_F)
+}
+
+reload() {
+       [ -f $PID_F ] && kill -USR2 $(cat $PID_F)
 }