kernel: update linux 3.2 to 3.2.9

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

diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index 62f584f..e26749e 100644 (file)
--- a/package/ppp/files/ppp.sh
+++ b/package/ppp/files/ppp.sh
@@ -1,63 +1,40 @@
-scan_ppp() {
-       config_get ifname "$1" ifname
-       pppdev="${pppdev:-0}"
-       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"
-       }
+stop_interface_ppp() {
+       local cfg="$1"
+
+       local proto
+       config_get proto "$cfg" proto
+
+       local link="$proto-$cfg"
+       SERVICE_PID_FILE="/var/run/ppp-${link}.pid" \
+       service_stop /usr/sbin/pppd
+
+       remove_dns "$cfg"
+
+       local lock="/var/lock/ppp-$link"
+       [ -f "$lock" ] && lock -u "$lock"

 }
 
 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"
+       # Workaround for PPPoE service and AC name options,
+       # filter out the nic-* argument and append it as last option
+       local nic=""
+       case "$1" in
+               nic-*) nic="$1"; shift ;;
+       esac
+
+       local proto
+       config_get proto "$cfg" proto
+
+       # unique link identifier
+       local link="${proto:-ppp}-$cfg"

 
        # make sure only one pppd process is started
 
        # 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}"
+       lock "/var/lock/ppp-${link}"
+       SERVICE_PID_FILE="/var/run/ppp-${link}.pid" \
+       service_check /usr/sbin/pppd && {
+               lock -u "/var/lock/ppp-${link}"

                return 0
        }
 
                return 0
        }
 


@@ -65,61 +42,101 @@ start_pppd() {
        # /dev/ppp fast enough to be used here
        [ -e /dev/ppp ] || mknod /dev/ppp c 108 0
 
        # /dev/ppp fast enough to be used here
        [ -e /dev/ppp ] || mknod /dev/ppp c 108 0
 

+       local device

        config_get device "$cfg" device
        config_get device "$cfg" device

-       config_get unit "$cfg" unit
+
+       local username

        config_get username "$cfg" username
        config_get username "$cfg" username

+
+       local password

        config_get password "$cfg" password
        config_get password "$cfg" password

+
+       local keepalive

        config_get keepalive "$cfg" keepalive
 
        config_get keepalive "$cfg" keepalive
 

+       local connect

        config_get connect "$cfg" connect
        config_get connect "$cfg" connect

+
+       local disconnect

        config_get disconnect "$cfg" disconnect
        config_get disconnect "$cfg" disconnect

+
+       local pppd_options

        config_get pppd_options "$cfg" pppd_options
        config_get pppd_options "$cfg" pppd_options

+
+       local defaultroute

        config_get_bool defaultroute "$cfg" defaultroute 1
        config_get_bool defaultroute "$cfg" defaultroute 1

-       [ "$defaultroute" -eq 1 ] && defaultroute="defaultroute replacedefaultroute" || defaultroute=""
+       [ "$defaultroute" -eq 1 ] && \
+               defaultroute="defaultroute replacedefaultroute" || defaultroute="nodefaultroute"

 
 

-       interval="${keepalive##*[, ]}"
+       local interval="${keepalive##*[, ]}"

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

-       config_get_bool peerdns "$cfg" peerdns 1
-       [ "$peerdns" -eq 1 ] && peerdns="usepeerdns" || {
+       local dns
+       config_get dns "$config" dns
+
+       local has_dns=0
+       local peer_default=1
+       [ -n "$dns" ] && {
+               has_dns=1
+               peer_default=0
+       }
+
+       local peerdns
+       config_get_bool peerdns "$cfg" peerdns $peer_default
+
+       [ "$peerdns" -eq 1 ] && {
+               peerdns="usepeerdns"
+       } || {

                peerdns=""
                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
+               add_dns "$cfg" $dns

        }
 
        }
 

-       config_get demand "$cfg" demand
-       [ -n "$demand" ] && echo "nameserver 1.1.1.1" > /tmp/resolv.conf.auto
+       local demand
+       config_get demand "$cfg" demand 0

 
 

+       local demandargs
+       [ "$demand" -gt 0 ] && {
+               demandargs="precompiled-active-filter /etc/ppp/filter demand idle $demand"
+               [ "$has_dns" -eq 0 ] && add_dns "$cfg" 1.1.1.1
+       } || {
+               demandargs="persist"
+       }
+
+       local ipv6

        config_get_bool ipv6 "$cfg" ipv6 0
        [ "$ipv6" -eq 1 ] && ipv6="+ipv6" || ipv6=""
 
        config_get_bool ipv6 "$cfg" ipv6 0
        [ "$ipv6" -eq 1 ] && ipv6="+ipv6" || ipv6=""
 

-       /usr/sbin/pppd "$@" \
+       SERVICE_DAEMONIZE=1 \
+       SERVICE_WRITE_PID=1 \
+       SERVICE_PID_FILE="/var/run/ppp-$link.pid" \
+       service_start /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} \
+               $demandargs \

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

-               unit "$unit" \
-               linkname "$cfg" \

                ipparam "$cfg" \
                ipparam "$cfg" \

+               ifname "$link" \

                ${connect:+connect "$connect"} \
                ${disconnect:+disconnect "$disconnect"} \
                ${ipv6} \
                ${connect:+connect "$connect"} \
                ${disconnect:+disconnect "$disconnect"} \
                ${ipv6} \

-               ${pppd_options}
+               ${pppd_options} \
+               nodetach \
+               ${nic}

 
 

-       lock -u "/var/lock/ppp-${cfg}"
+       lock -u "/var/lock/ppp-${link}"

 }
 
 setup_interface_ppp() {
        local iface="$1"
        local config="$2"
 
 }
 
 setup_interface_ppp() {
        local iface="$1"
        local config="$2"
 

+       local device

        config_get device "$config" device
 
        config_get device "$config" device
 

+       local mtu

        config_get mtu "$config" 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 \