[ifxos] (oops - second try) fixed autoconf detection for 2.6.33 kernel

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

diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index 6b8ad9c..62f584f 100644 (file)
--- a/package/ppp/files/ppp.sh
+++ b/package/ppp/files/ppp.sh
@@ -1,16 +1,57 @@
 scan_ppp() {
        config_get ifname "$1" ifname
        pppdev="${pppdev:-0}"
-       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))"
+       config_get devunit "$1" unit
+       {
+               unit=
+               pppif=
+               if [ ! -d /tmp/.ppp-counter ]; then
+                    mkdir -p /tmp/.ppp-counter
+               fi
+               local maxunit
+               maxunit="$(cat /tmp/.ppp-counter/max-unit 2>/dev/null)" 
+               if [ -z "$maxunit" ]; then
+                   maxunit=-1
+               fi
+               local i
+               i=0
+               while [ $i -le $maxunit ]; do
+                    local unitdev
+                    unitdev="$(cat /tmp/.ppp-counter/ppp${i} 2>/dev/null)"
+                    if [ "$unitdev" = "$1" ]; then
+                         unit="$i"
+                         pppif="ppp${i}"
+                         break
+                    fi
+                    i="$(($i + 1))"
+               done 
+               if [ -z "$unit" ] || [ -z "$pppif" ]; then
+                   maxunit="$(($maxunit + 1))"
+                   if [ -n "$devunit" ]; then
+                       unit="$devunit"
+                   elif [ "${ifname%%[0-9]*}" = ppp ]; then
+                        unit="${ifname##ppp}"
+                   else
+                        unit="$maxunit"
+                   fi 
+                   [ "$maxunit" -lt "$unit" ] && maxunit="$unit"
+                   pppif="ppp${unit}"
+                   echo "$1" >/tmp/.ppp-counter/$pppif 2>/dev/null
+                   echo "$maxunit" >/tmp/.ppp-counter/max-unit 2>/dev/null
+               fi
+               config_set "$1" ifname "ppp$unit"
+               config_set "$1" unit "$unit"
        }
 }
 
 start_pppd() {
        local cfg="$1"; shift
+       local ifname
+
+       # make sure the network state references the correct ifname
+       scan_ppp "$cfg"
+       config_get ifname "$cfg" ifname
+       set_interface_ifname "$cfg" "$ifname"
 
        # make sure only one pppd process is started
        lock "/var/lock/ppp-${cfg}"
@@ -39,9 +80,16 @@ start_pppd() {
        interval="${keepalive##*[, ]}"
        [ "$interval" != "$keepalive" ] || interval=5
 
-       config_get_bool peerdns "$cfg" peerdns 1 
-       [ "$peerdns" -eq 1 ] && peerdns="usepeerdns" || peerdns="" 
-       
+       config_get_bool peerdns "$cfg" peerdns 1
+       [ "$peerdns" -eq 1 ] && peerdns="usepeerdns" || {
+               peerdns=""
+               config_get dns "$config" dns
+               for dns in $dns; do
+                       grep -q "$dns" /tmp/resolv.conf.auto 2>/dev/null || \
+                               echo "nameserver $dns" >> /tmp/resolv.conf.auto
+               done
+       }
+
        config_get demand "$cfg" demand
        [ -n "$demand" ] && echo "nameserver 1.1.1.1" > /tmp/resolv.conf.auto
 
@@ -71,7 +119,7 @@ setup_interface_ppp() {
 
        config_get device "$config" device
 
-       config_get mtu "$cfg" mtu
+       config_get mtu "$config" mtu
        mtu=${mtu:-1492}
        start_pppd "$config" \
                mtu $mtu mru $mtu \