typos

[openwrt.git] / package / ppp / files / ifup.pppoa

diff --git a/package/ppp/files/ifup.pppoa b/package/ppp/files/ifup.pppoa
index 5f42a39..277266c 100644 (file)
--- a/package/ppp/files/ifup.pppoa
+++ b/package/ppp/files/ifup.pppoa
@@ -1,11 +1,10 @@
 #!/bin/sh
 [ $# = 0 ] && { echo "  $0 <group>"; exit; }
-. /etc/functions.sh
-. /etc/network.overrides
-[ -e /etc/config/network ] && . /etc/config/network
+. /etc/config/network
 type=$1
 
-[ "$(nvram get ${type}_proto)" = "pppoa" ] || {
+eval "proto=\"\${${type}_proto}\""
+[ "$proto" = "pppoa" ] || {
        echo "$0: ${type}_proto isn't pppoa"
        exit
 }
@@ -14,36 +13,24 @@ for module in slhc ppp_generic pppoatm; do
        /sbin/insmod $module 2>&- >&-
 done
 
-while :; do
-       VPI=$(nvram get atm_vpi)
-       VCI=$(nvram get atm_vci)
-       USERNAME=$(nvram get ppp_username)
-       PASSWORD=$(nvram get ppp_passwd)
-       KEEPALIVE=$(nvram get ppp_redialperiod)
-       KEEPALIVE=${KEEPALIVE:+lcp-echo-interval 10 lcp-echo-failure $KEEPALIVE}
-       DEMAND=$(nvram get ppp_demand)
-       case "$DEMAND" in
-               on|1|enabled)
-                       DEMAND=$(nvram get ppp_idletime)
-                       DEMAND=${IDLETIME:+demand idle $IDLETIME}
-               ;;
-               *) DEMAND="";;
-       esac
-       MTU=$(nvram get ppp_mtu)
-       MTU=${MTU:-1500}
+KEEPALIVE=${ppp_redialperiod:+lcp-echo-interval $ppp_redialperiod lcp-echo-failure 5}
+case "$ppp_demand" in
+       on|1|enabled)
+               DEMAND=${ppp_idletime:+demand idle $ppp_idletime}
+               [ -f /etc/ppp/filter ] && DEMAND=${DEMAND:+precompiled-active-filter /etc/ppp/filter $DEMAND}
+       ;;
+       *) DEMAND="persist";;
+esac
+MTU=${ppp_mtu:-1500}
 
-       /usr/sbin/pppd nodetach \
-       plugin pppoatm.so ${VPI:-8}.${VCI:-35} \
-               usepeerdns \
-               defaultroute \
-               linkname $type \
-               ipparam $type \
-               user "$USERNAME" \
-               password "$PASSWORD" \
-               mtu $MTU mru $MTU \
-               $DEMAND \
-               $KEEPALIVE
-       
-       # Read settings again (might have changed)
-       [ -e /etc/config/network ] && . /etc/config/network
-done &
+/usr/sbin/pppd \
+       plugin pppoatm.so ${atm_vpi:-8}.${atm_vci:-35} \
+       usepeerdns \
+       defaultroute \
+       linkname $type \
+       ipparam $type \
+       user "$ppp_username" \
+       password "$ppp_passwd" \
+       mtu $MTU mru $MTU \
+       $DEMAND \
+       $KEEPALIVE