make network scripts more robust, prevent multiple instances of pppd and udhcpc for...

[openwrt-10.03/.git] / package / ppp / files / ppp.sh

diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index e6008f40c82e40f2ba143c6f99679113fb2520e2..133400509ceba52dffdf5766864964b410df361c 100644 (file)
--- a/package/ppp/files/ppp.sh
+++ b/package/ppp/files/ppp.sh
@@ -1,25 +1,29 @@
 scan_ppp() {
        config_get ifname "$1" ifname
        pppdev="${pppdev:-0}"
-       config_set "$1" device "$ifname"
        config_set "$1" ifname "ppp$pppdev"
        config_set "$1" unit "$pppdev"
 }
 
 start_pppd() {
        local cfg="$1"; shift
+       
+       # make sure only one pppd process is started
+       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
+
        config_get device "$cfg" device
        config_get unit "$cfg" unit
        config_get username "$cfg" username
        config_get password "$cfg" password
        config_get keepalive "$cfg" keepalive
-       interval="${keepalive%%*,}"
+       interval="${keepalive%%*[, ]}"
        [ "$interval" != "$keepalive" ] || interval=5
        
        config_get demand "$cfg" demand
        [ -n "$demand" ] && echo "nameserver 1.1.1.1" > /tmp/resolv.conf
        /usr/sbin/pppd "$@" \
-               ${keepalive:+lcp-echo-interval $interval lcp-echo-failure ${keepalive##,*}} \
+               ${keepalive:+lcp-echo-interval $interval lcp-echo-failure ${keepalive##[, ]*}} \
                ${demand:+precompiled-active-filter /etc/ppp/filter demand idle }${demand:-persist} \
                usepeerdns \
                defaultroute \