summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-11-11 20:51:58 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-11-11 20:51:58 +0000
commit91490c783caef361912fa8993c7283abe65aa3b3 (patch)
treeb3f962d4f135418e94fe5e17061d599c176d1ad5
parent72a9e66eeabdad2c44923a1cb9f916723de595ee (diff)
add lcp ping to ppp ifup script so that it timeouts properly (fixes #42)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2434 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--openwrt/package/ppp/files/ifup.pppoa52
-rw-r--r--openwrt/package/ppp/files/ifup.pppoe58
2 files changed, 61 insertions, 49 deletions
diff --git a/openwrt/package/ppp/files/ifup.pppoa b/openwrt/package/ppp/files/ifup.pppoa
index 8928366364..5f42a39d08 100644
--- a/openwrt/package/ppp/files/ifup.pppoa
+++ b/openwrt/package/ppp/files/ifup.pppoa
@@ -15,29 +15,35 @@ for module in slhc ppp_generic pppoatm; do
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:-1500}
+ VPI=$(nvram get atm_vpi)
+ VCI=$(nvram get atm_vci)
+ USERNAME=$(nvram get ppp_username)
+ PASSWORD=$(nvram get ppp_passwd)
+ 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:-1500}
- /usr/sbin/pppd nodetach \
+ /usr/sbin/pppd nodetach \
plugin pppoatm.so ${VPI:-8}.${VCI:-35} \
- usepeerdns \
- defaultroute \
- linkname $type \
- ipparam $type \
- user "$USERNAME" \
- password "$PASSWORD" \
- mtu $MTU mru $MTU \
- $IDLETIME \
- $REDIAL
-
- # Read settings again (might have changed)
- [ -e /etc/config/network ] && . /etc/config/network
+ usepeerdns \
+ defaultroute \
+ linkname $type \
+ ipparam $type \
+ user "$USERNAME" \
+ password "$PASSWORD" \
+ mtu $MTU mru $MTU \
+ $DEMAND \
+ $KEEPALIVE
+
+ # Read settings again (might have changed)
+ [ -e /etc/config/network ] && . /etc/config/network
done &
diff --git a/openwrt/package/ppp/files/ifup.pppoe b/openwrt/package/ppp/files/ifup.pppoe
index da9a441ad9..36bbe30299 100644
--- a/openwrt/package/ppp/files/ifup.pppoe
+++ b/openwrt/package/ppp/files/ifup.pppoe
@@ -15,31 +15,37 @@ for module in slhc ppp_generic pppox pppoe; do
done
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}
- MTU=$(nvram get ppp_mtu)
- MTU=${MTU:-1492}
+ IFNAME=$(nvram get pppoe_ifname)
+ USERNAME=$(nvram get ppp_username)
+ PASSWORD=$(nvram get ppp_passwd)
+ 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}
- ifconfig $IFNAME up
- /usr/sbin/pppd nodetach \
- plugin rp-pppoe.so \
- connect /bin/true \
- usepeerdns \
- defaultroute \
- linkname $type \
- ipparam $type \
- user "$USERNAME" \
- password "$PASSWORD" \
- mtu $MTU mru $MTU \
- $IDLETIME \
- $REDIAL \
- nic-$IFNAME
-
- # Read settings again (might have changed)
- [ -e /etc/config/network ] && . /etc/config/network
+ ifconfig $IFNAME up
+ /usr/sbin/pppd nodetach \
+ plugin rp-pppoe.so \
+ connect /bin/true \
+ usepeerdns \
+ defaultroute \
+ linkname $type \
+ ipparam $type \
+ user "$USERNAME" \
+ password "$PASSWORD" \
+ mtu $MTU mru $MTU \
+ $DEMAND \
+ $KEEPALIVE \
+ nic-$IFNAME
+
+ # Read settings again (might have changed)
+ [ -e /etc/config/network ] && . /etc/config/network
done &