mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-02-03 05:12:51 +00:00
use lock to remove race conditions in bringing up ppp and dhcp that would lead to multiple active processes
SVN-Revision: 5298
This commit is contained in:
parent
3d497ab62c
commit
9abdf580d9
@ -121,8 +121,12 @@ setup_interface() {
|
|||||||
;;
|
;;
|
||||||
dhcp)
|
dhcp)
|
||||||
# prevent udhcpc from starting more than once
|
# prevent udhcpc from starting more than once
|
||||||
|
lock "/var/lock/dhcp-$iface"
|
||||||
pid="$(cat "$pidfile" 2>/dev/null)"
|
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 ipaddr "$config" ipaddr
|
||||||
config_get netmask "$config" netmask
|
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)
|
# 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"
|
[ "$proto1" != "$proto" ] && dhcpopts="-n -q"
|
||||||
$DEBUG udhcpc -i "$iface" ${ipaddr:+-r $ipaddr} ${hostname:+-H $hostname} -b -p "$pidfile" ${dhcpopts:- -R &}
|
$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
|
if ( eval "type setup_interface_$proto" ) >/dev/null 2>/dev/null; then
|
||||||
|
@ -12,14 +12,24 @@ debug "### ifdown $cfg ###"
|
|||||||
config_get proto "$cfg" proto
|
config_get proto "$cfg" proto
|
||||||
[ -z "$proto" ] && { echo "interface not found."; exit; }
|
[ -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
|
# kill active ppp daemon and other processes
|
||||||
config_get ifname "$cfg" ifname
|
config_get ifname "$cfg" ifname
|
||||||
pids="$(cat /var/run/${ifname}.pid /var/run/ppp-${cfg}.pid 2>/dev/null)"
|
pids="$(cat /var/run/${ifname}.pid /var/run/ppp-${cfg}.pid 2>/dev/null)"
|
||||||
for pid in $pids; do
|
for pid in $pids; do
|
||||||
[ -d "/proc/$pid" ] && {
|
[ -d "/proc/$pid" ] && {
|
||||||
kill $pid
|
kill $pid
|
||||||
|
[ -d "/proc/$pid" ] && {
|
||||||
sleep 1
|
sleep 1
|
||||||
[ -d "/proc/$pid" ] && kill -9 $pid
|
kill -9 $pid 2>/dev/null >/dev/null
|
||||||
|
}
|
||||||
}
|
}
|
||||||
done
|
done
|
||||||
rm -f /var/run/${ifname}.pid /var/run/ppp-${cfg}.pid
|
rm -f /var/run/${ifname}.pid /var/run/ppp-${cfg}.pid
|
||||||
|
@ -9,8 +9,12 @@ start_pppd() {
|
|||||||
local cfg="$1"; shift
|
local cfg="$1"; shift
|
||||||
|
|
||||||
# make sure only one pppd process is started
|
# make sure only one pppd process is started
|
||||||
|
lock "/var/lock/ppp-${cfg}"
|
||||||
local pid="$(cat /var/run/ppp-${cfg}.pid 2>/dev/null)"
|
local pid="$(cat /var/run/ppp-${cfg}.pid 2>/dev/null)"
|
||||||
[ -d "/proc/$pid" ] && grep pppd "/proc/$pid/cmdline" 2>/dev/null >/dev/null && return 0
|
[ -d "/proc/$pid" ] && grep pppd "/proc/$pid/cmdline" 2>/dev/null >/dev/null && {
|
||||||
|
lock -u "/var/lock/ppp-${cfg}"
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
config_get device "$cfg" device
|
config_get device "$cfg" device
|
||||||
config_get unit "$cfg" unit
|
config_get unit "$cfg" unit
|
||||||
@ -31,4 +35,6 @@ start_pppd() {
|
|||||||
${username:+user "$username" password "$password"} \
|
${username:+user "$username" password "$password"} \
|
||||||
linkname "$cfg" \
|
linkname "$cfg" \
|
||||||
ipparam "$cfg"
|
ipparam "$cfg"
|
||||||
|
|
||||||
|
lock -u "/var/lock/ppp-${cfg}"
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user