qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00
Code Activity

use lock to remove race conditions in bringing up ppp and dhcp that would lead to multiple active processes

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5298 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd
2006-10-26 01:33:36 +00:00
parent 81ddc1b91c
commit 0d67238dc6
3 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
package/base-files/default/lib/network/config.sh
View File

@@ -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