fix ppp interface enumeration - don't enumerate already processed interfaces

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

diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index 51a1955..6b8ad9c 100644 (file)
--- a/package/ppp/files/ppp.sh
+++ b/package/ppp/files/ppp.sh
@@ -1,30 +1,80 @@
 scan_ppp() {
        config_get ifname "$1" ifname
        pppdev="${pppdev:-0}"
 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"
+       config_get unit "$1" unit
+       [ -z "$unit" -a "${ifname%%[0-9]*}" != ppp ] && {
+               config_set "$1" ifname "ppp$pppdev"
+               config_set "$1" unit "$pppdev"
+               pppdev="$(($pppdev + 1))"
+       }

 }
 
 start_pppd() {
        local cfg="$1"; shift
 }
 
 start_pppd() {
        local cfg="$1"; shift

+
+       # make sure only one pppd process is started
+       lock "/var/lock/ppp-${cfg}"
+       local pid="$(head -n1 /var/run/ppp-${cfg}.pid 2>/dev/null)"
+       [ -d "/proc/$pid" ] && grep pppd "/proc/$pid/cmdline" 2>/dev/null >/dev/null && {
+               lock -u "/var/lock/ppp-${cfg}"
+               return 0
+       }
+
+       # Workaround: sometimes hotplug2 doesn't deliver the hotplug event for creating
+       # /dev/ppp fast enough to be used here
+       [ -e /dev/ppp ] || mknod /dev/ppp c 108 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
        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%%*[, ]}"
+
+       config_get connect "$cfg" connect
+       config_get disconnect "$cfg" disconnect
+       config_get pppd_options "$cfg" pppd_options
+       config_get_bool defaultroute "$cfg" defaultroute 1
+       [ "$defaultroute" -eq 1 ] && defaultroute="defaultroute replacedefaultroute" || defaultroute=""
+
+       interval="${keepalive##*[, ]}"

        [ "$interval" != "$keepalive" ] || interval=5
        [ "$interval" != "$keepalive" ] || interval=5

+
+       config_get_bool peerdns "$cfg" peerdns 1 
+       [ "$peerdns" -eq 1 ] && peerdns="usepeerdns" || peerdns="" 

        
        config_get demand "$cfg" demand
        
        config_get demand "$cfg" demand

-       [ -n "$demand" ] && echo "nameserver 1.1.1.1" > /tmp/resolv.conf
+       [ -n "$demand" ] && echo "nameserver 1.1.1.1" > /tmp/resolv.conf.auto
+
+       config_get_bool ipv6 "$cfg" ipv6 0
+       [ "$ipv6" -eq 1 ] && ipv6="+ipv6" || ipv6=""
+

        /usr/sbin/pppd "$@" \
        /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} \
                ${demand:+precompiled-active-filter /etc/ppp/filter demand idle }${demand:-persist} \

-               usepeerdns \
-               defaultroute \
-               replacedefaultroute \
+               $peerdns \
+               $defaultroute \

                ${username:+user "$username" password "$password"} \
                ${username:+user "$username" password "$password"} \

+               unit "$unit" \

                linkname "$cfg" \
                linkname "$cfg" \

-               ipparam "$cfg"
+               ipparam "$cfg" \
+               ${connect:+connect "$connect"} \
+               ${disconnect:+disconnect "$disconnect"} \
+               ${ipv6} \
+               ${pppd_options}
+
+       lock -u "/var/lock/ppp-${cfg}"

 }
 }

+
+setup_interface_ppp() {
+       local iface="$1"
+       local config="$2"
+
+       config_get device "$config" device
+
+       config_get mtu "$cfg" mtu
+       mtu=${mtu:-1492}
+       start_pppd "$config" \
+               mtu $mtu mru $mtu \
+               "$device"
+}
+