add lcp ping to ppp ifup script so that it timeouts properly (fixes #42)

SVN-Revision: 2433

diff --git a/openwrt/package/ppp/files/ifup.pppoe b/openwrt/package/ppp/files/ifup.pppoe
index 80d44783b68a4b3559d09741f8d212a5bbe7334a..bf1fa1f792ab58a3bf05d3f302760c37fd7f1646 100644 (file)
--- a/openwrt/package/ppp/files/ifup.pppoe
+++ b/openwrt/package/ppp/files/ifup.pppoe
@@ -16,10 +16,17 @@ while :; do
        IFNAME=$(nvram get pppoe_ifname)
        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:-1492}
 
@@ -36,7 +43,7 @@ while :; do
                password "$PASSWORD" \
                mtu $MTU \
                mru $MTU \
-               $IDLETIME \
-               $REDIAL \
+               $DEMAND \
+               $KEEPALIVE \
                nic-$IFNAME
 done &