aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2005-11-11 21:15:33 +0000
committerFelix Fietkau <nbd@openwrt.org>2005-11-11 21:15:33 +0000
commitd0014d972f224716fa46e7bdc50450a259ca29d5 (patch)
treeca0b6ffa8ff29b30049f13ceeed28533b0042471
parentfc882de1c5b3803f577b1c3c204e77e9fa67b4b6 (diff)
downloadupstream-d0014d972f224716fa46e7bdc50450a259ca29d5.tar.gz
upstream-d0014d972f224716fa46e7bdc50450a259ca29d5.tar.bz2
upstream-d0014d972f224716fa46e7bdc50450a259ca29d5.zip
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
-rw-r--r--package/pptp/files/ifup.pptp21
1 files changed, 13 insertions, 8 deletions
diff --git a/package/pptp/files/ifup.pptp b/package/pptp/files/ifup.pptp
index acaeabd971..23cad08050 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 &