diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-10-26 01:33:36 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-10-26 01:33:36 +0000 |
| commit | 0d67238dc68a0d410c484064e2eccb1808df94ac (patch) | |
| tree | b26a16748dffb5ff899a9e14eb1de3f00b938cf1 /package/base-files/default | |
| parent | 81ddc1b91ccffce0d0be47c55f9b50115f5a6869 (diff) | |
use lock to remove race conditions in bringing up ppp and dhcp that would lead to multiple active processes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5298 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files/default')
| -rwxr-xr-x | package/base-files/default/lib/network/config.sh | 7 | ||||
| -rwxr-xr-x | package/base-files/default/sbin/ifdown | 14 |
2 files changed, 18 insertions, 3 deletions
diff --git a/package/base-files/default/lib/network/config.sh b/package/base-files/default/lib/network/config.sh index 25c7278e99..9c91a7cabf 100755 --- a/package/base-files/default/lib/network/config.sh +++ b/package/base-files/default/lib/network/config.sh @@ -121,8 +121,12 @@ setup_interface() { ;; dhcp) # prevent udhcpc from starting more than once + lock "/var/lock/dhcp-$iface" pid="$(cat "$pidfile" 2>/dev/null)" - [ -d "/proc/$pid" ] && grep udhcpc "/proc/${pid}/cmdline" >/dev/null 2>/dev/null && return 0 + [ -d "/proc/$pid" ] && grep udhcpc "/proc/${pid}/cmdline" >/dev/null 2>/dev/null && { + lock -u "/var/lock/dhcp-$iface" + return 0 + } config_get ipaddr "$config" ipaddr config_get netmask "$config" netmask @@ -135,6 +139,7 @@ setup_interface() { # don't stay running in background if dhcp is not the main proto on the interface (e.g. when using pptp) [ "$proto1" != "$proto" ] && dhcpopts="-n -q" $DEBUG udhcpc -i "$iface" ${ipaddr:+-r $ipaddr} ${hostname:+-H $hostname} -b -p "$pidfile" ${dhcpopts:- -R &} + lock -u "/var/lock/dhcp-$iface" ;; *) if ( eval "type setup_interface_$proto" ) >/dev/null 2>/dev/null; then diff --git a/package/base-files/default/sbin/ifdown b/package/base-files/default/sbin/ifdown index 37d0918e85..50d59d1df8 100755 --- a/package/base-files/default/sbin/ifdown +++ b/package/base-files/default/sbin/ifdown @@ -12,14 +12,24 @@ debug "### ifdown $cfg ###" config_get proto "$cfg" proto [ -z "$proto" ] && { echo "interface not found."; exit; } +# 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 - sleep 1 - [ -d "/proc/$pid" ] && kill -9 $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 |