/lib/network/ppp.sh fixes a problem with PPtP (and other PPP-based things) where...

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

diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index 84def12..62f584f 100644 (file)
--- a/package/ppp/files/ppp.sh
+++ b/package/ppp/files/ppp.sh
@@ -1,13 +1,57 @@
 scan_ppp() {
        config_get ifname "$1" ifname
        pppdev="${pppdev:-0}"
 scan_ppp() {
        config_get ifname "$1" ifname
        pppdev="${pppdev:-0}"

-       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
 }
 
 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}"
 
        # make sure only one pppd process is started
        lock "/var/lock/ppp-${cfg}"


@@ -17,6 +61,10 @@ start_pppd() {
                return 0
        }
 
                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 device "$cfg" device
        config_get unit "$cfg" unit
        config_get username "$cfg" username


@@ -26,24 +74,40 @@ start_pppd() {
        config_get connect "$cfg" connect
        config_get disconnect "$cfg" disconnect
        config_get pppd_options "$cfg" pppd_options
        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" != "$keepalive" ] || interval=5

-       
+
+       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
        config_get demand "$cfg" demand
        [ -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 "$@" \
                ${keepalive:+lcp-echo-interval $interval lcp-echo-failure ${keepalive%%[, ]*}} \
                ${demand:+precompiled-active-filter /etc/ppp/filter demand idle }${demand:-persist} \
        /usr/sbin/pppd "$@" \
                ${keepalive:+lcp-echo-interval $interval lcp-echo-failure ${keepalive%%[, ]*}} \
                ${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 "$pppdev" \
+               unit "$unit" \

                linkname "$cfg" \
                ipparam "$cfg" \
                ${connect:+connect "$connect"} \
                ${disconnect:+disconnect "$disconnect"} \
                linkname "$cfg" \
                ipparam "$cfg" \
                ${connect:+connect "$connect"} \
                ${disconnect:+disconnect "$disconnect"} \

+               ${ipv6} \

                ${pppd_options}
 
        lock -u "/var/lock/ppp-${cfg}"
                ${pppd_options}
 
        lock -u "/var/lock/ppp-${cfg}"


@@ -55,7 +119,7 @@ setup_interface_ppp() {
 
        config_get device "$config" device
 
 
        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 \
        mtu=${mtu:-1492}
        start_pppd "$config" \
                mtu $mtu mru $mtu \