use lock to remove race conditions in bringing up ppp and dhcp that would lead to...

[openwrt.git] / package / base-files / default / sbin / ifdown

diff --git a/package/base-files/default/sbin/ifdown b/package/base-files/default/sbin/ifdown
index 7debb95..50d59d1 100755 (executable)
--- a/package/base-files/default/sbin/ifdown
+++ b/package/base-files/default/sbin/ifdown
@@ -3,32 +3,45 @@
 
 [ $# = 0 ] && { echo "  $0 <group>"; exit; }
 . /etc/functions.sh
 
 [ $# = 0 ] && { echo "  $0 <group>"; exit; }
 . /etc/functions.sh

-include network
+include /lib/network

 scan_interfaces
 
 scan_interfaces
 

-debug "### ifdown $type ###"
-type=$1
+cfg=$1
+debug "### ifdown $cfg ###"

 
 

-config_get proto "$type" proto
+config_get proto "$cfg" proto

 [ -z "$proto" ] && { echo "interface not found."; exit; }
 
 [ -z "$proto" ] && { echo "interface not found."; exit; }
 

-# kill active ppp daemon
-pid="$(cat /var/run/ppp-${type}.pid 2>/dev/null)"
-[ -n "$pid" -a -d "/proc/$pid" ] && {
-       kill $pid
-       sleep 1
-       [ -d "/proc/$pid" ] && kill -9 $pid
-}
-
-# kill any other process associated with the interface
-config_get ifname "$type" ifname
-pid="$(cat /var/run/${ifname}.pid 2>/dev/null)"
-[ -n "$pid" -a -d "/proc/$pid" ] && kill -9 $pid
-
-config_get ifname "$type" ifname
-ifconfig "$ifname" >/dev/null 2>/dev/null && {
-       ifconfig "$ifname" 0.0.0.0 down
-
-       config_get iftype "$type" type
-       [ "$iftype" = "bridge" ] && brctl delbr "$ifname"
-}
+# make sure all locks are removed
+for lock in "/var/lock/dhcp-$iface" "/var/lock/ppp-$iface"; do
+       [ -f "$lock" ] && {
+               lock -u "$lock"
+               sleep 1
+       }
+done
+
+# kill active ppp daemon and other processes
+config_get ifname "$cfg" ifname
+pids="$(cat /var/run/${ifname}.pid /var/run/ppp-${cfg}.pid 2>/dev/null)"
+for pid in $pids; do 
+       [ -d "/proc/$pid" ] && {
+               kill $pid
+               [ -d "/proc/$pid" ] && {
+                       sleep 1
+                       kill -9 $pid 2>/dev/null >/dev/null
+               }
+       }
+done
+rm -f /var/run/${ifname}.pid /var/run/ppp-${cfg}.pid
+
+config_get ifname "$cfg" ifname
+config_get device "$cfg" ifname
+
+[ ."$device" != ."$ifname" ] || device=
+for dev in $ifname $device; do
+       ifconfig "$ifname" 0.0.0.0 down >/dev/null 2>/dev/null
+done
+
+config_get iftype "$cfg" type
+[ "$iftype" = "bridge" ] && brctl delbr "$ifname" >/dev/null 2>/dev/null
+