X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/8cecd99d4a179c37aa4b841667524054392ebaad..45c7419a4f7a4436c27ffd62b1a05724c4ce6357:/openwrt/package/ppp/files/ifup.pppoa

diff --git a/openwrt/package/ppp/files/ifup.pppoa b/openwrt/package/ppp/files/ifup.pppoa
index dc08aa545..277266c0f 100644
--- a/openwrt/package/ppp/files/ifup.pppoa
+++ b/openwrt/package/ppp/files/ifup.pppoa
@@ -1,44 +1,36 @@
 #!/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
 }
 
-for module in slhc ppp_generic pppox pppoatm; do
+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)
-  REDIAL=$(nvram get ppp_redialperiod)
-  REDIAL=${REDIAL:+lcp-echo-interval $REDIAL}
-  IDLETIME=$(nvram get ppp_idletime)
-  IDLETIME=${IDLETIME:+lcp-echo-failure $IDLETIME}
-  MTU=$(nvram get ppp_mtu)
-  MTU=${MTU:-1492}
-  MTU=${MTU:+ mtu $MTU mru $MTU}
+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}
 
-  ifconfig $IFNAME up
-  /usr/sbin/pppd nodetach \
-	plugin pppoatm.so ${VPI:-8}.${VCI:-35} \
-  	usepeerdns \
-  	defaultroute \
-  	linkname $type \
-  	user "$USERNAME" \
-  	password "$PASSWORD" \
-  	$MTU \
-  	$IDLETIME \
-  	$REDIAL
-  
-  # 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