mac80211: improve wifi interface cleanup

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

diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index 5ca1cf9..23fcb89 100644 (file)
--- a/package/ppp/files/ppp.sh
+++ b/package/ppp/files/ppp.sh
@@ -3,14 +3,26 @@ scan_ppp() {
        pppdev="${pppdev:-0}"
        config_get unit "$1" unit
        [ -z "$unit" ] && {
        pppdev="${pppdev:-0}"
        config_get unit "$1" unit
        [ -z "$unit" ] && {

-               config_set "$1" ifname "ppp$pppdev"
-               config_set "$1" unit "$pppdev"
-               pppdev="$(($pppdev + 1))"
+               unit="$pppdev"
+               if [ "${ifname%%[0-9]*}" = ppp ]; then
+                       unit="${ifname##ppp}"
+                       [ "$pppdev" -le "$unit" ] && pppdev="$(($unit + 1))"
+               else
+                       pppdev="$(($pppdev + 1))"
+               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}"


@@ -20,6 +32,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


@@ -34,13 +50,27 @@ start_pppd() {
 
        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 \
+               $peerdns \

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


@@ -48,6 +78,7 @@ start_pppd() {
                ipparam "$cfg" \
                ${connect:+connect "$connect"} \
                ${disconnect:+disconnect "$disconnect"} \
                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}"


@@ -59,7 +90,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 \