X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/ce409cfdea924fd84ab05cbfb61f22c678264d57..88a55754b24e2bb45b2b93b68bcc864fa8757eaa:/openwrt/package/pptp/files/ifup.pptp

diff --git a/openwrt/package/pptp/files/ifup.pptp b/openwrt/package/pptp/files/ifup.pptp
index 15178fe30..23cad0805 100644
--- a/openwrt/package/pptp/files/ifup.pptp
+++ b/openwrt/package/pptp/files/ifup.pptp
@@ -17,12 +17,18 @@ 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:+ mtu $MTU mru $MTU}
+	MTU=${MTU:-1452}
 
 	do_ifup $PPTP_PROTO $type
 	
@@ -38,11 +44,12 @@ while :; do
 		usepeerdns \
 		defaultroute \
 		replacedefaultroute \
-		linkname $type \
+		linkname "$type" \
+		ipparam "$type" \
 		user "$USERNAME" \
 		password "$PASSWORD" \
-		$MTU \
-		$IDLETIME \
-		$REDIAL
+		mtu $MTU mru $MTU \
+		$DEMAND \
+		$KEEPALIVE
 done &