From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 11 Nov 2005 21:15:33 +0000 (+0000)
Subject: add new ppp timeout/redial stuff from [2433] to pptp init script
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=2663cb716873d252ed952b18266d43808f8784df

add new ppp timeout/redial stuff from [2433] to pptp init script

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2436 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/pptp/files/ifup.pptp b/package/pptp/files/ifup.pptp
index acaeabd97..23cad0805 100644
--- a/package/pptp/files/ifup.pptp
+++ b/package/pptp/files/ifup.pptp
@@ -17,10 +17,16 @@ while :; do
 	IP=$(nvram get pptp_server_ip)
 	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}
+	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:-1452}
 
@@ -42,9 +48,8 @@ while :; do
 		ipparam "$type" \
 		user "$USERNAME" \
 		password "$PASSWORD" \
-		mtu $MTU \
-		mru $MTU \
-		$IDLETIME \
-		$REDIAL
+		mtu $MTU mru $MTU \
+		$DEMAND \
+		$KEEPALIVE
 done &