mr/openwrt
2
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

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

Browse Source 
SVN-Revision: 2434
This commit is contained in:
Felix Fietkau 2005-11-11 20:51:58 +00:00
parent 534ed31049
commit b1bd45109e
2 changed files with 61 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
openwrt/package/ppp/files/ifup.pppoa
View File

@ -15,29 +15,35 @@ for module in slhc ppp_generic pppoatm; do
done done
while :; do while :; do
VPI=$(nvram get atm_vpi) VPI=$(nvram get atm_vpi)
VCI=$(nvram get atm_vci) VCI=$(nvram get atm_vci)
USERNAME=$(nvram get ppp_username) USERNAME=$(nvram get ppp_username)
PASSWORD=$(nvram get ppp_passwd) PASSWORD=$(nvram get ppp_passwd)
REDIAL=$(nvram get ppp_redialperiod) KEEPALIVE=$(nvram get ppp_redialperiod)
REDIAL=${REDIAL:+lcp-echo-interval $REDIAL} KEEPALIVE=${KEEPALIVE:+lcp-echo-interval 10 lcp-echo-failure $KEEPALIVE}
IDLETIME=$(nvram get ppp_idletime) DEMAND=$(nvram get ppp_demand)
IDLETIME=${IDLETIME:+lcp-echo-failure $IDLETIME} case "$DEMAND" in
MTU=$(nvram get ppp_mtu) on|1|enabled)
MTU=${MTU:-1500} 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} \ plugin pppoatm.so ${VPI:-8}.${VCI:-35} \
usepeerdns \ usepeerdns \
defaultroute \ defaultroute \
linkname $type \ linkname $type \
ipparam $type \ ipparam $type \
user "$USERNAME" \ user "$USERNAME" \
password "$PASSWORD" \ password "$PASSWORD" \
mtu $MTU mru $MTU \ mtu $MTU mru $MTU \
$IDLETIME \ $DEMAND \
$REDIAL $KEEPALIVE
# Read settings again (might have changed) # Read settings again (might have changed)
[ -e /etc/config/network ] && . /etc/config/network [ -e /etc/config/network ] && . /etc/config/network
done & done &

58
openwrt/package/ppp/files/ifup.pppoe
View File

@ -15,31 +15,37 @@ for module in slhc ppp_generic pppox pppoe; do
done done
while :; do while :; do
IFNAME=$(nvram get pppoe_ifname) IFNAME=$(nvram get pppoe_ifname)
USERNAME=$(nvram get ppp_username) USERNAME=$(nvram get ppp_username)
PASSWORD=$(nvram get ppp_passwd) PASSWORD=$(nvram get ppp_passwd)
REDIAL=$(nvram get ppp_redialperiod) KEEPALIVE=$(nvram get ppp_redialperiod)
REDIAL=${REDIAL:+lcp-echo-interval $REDIAL} KEEPALIVE=${KEEPALIVE:+lcp-echo-interval 10 lcp-echo-failure $KEEPALIVE}
IDLETIME=$(nvram get ppp_idletime) DEMAND=$(nvram get ppp_demand)
IDLETIME=${IDLETIME:+lcp-echo-failure $IDLETIME} case "$DEMAND" in
MTU=$(nvram get ppp_mtu) on|1|enabled)
MTU=${MTU:-1492} DEMAND=$(nvram get ppp_idletime)
DEMAND=${IDLETIME:+demand idle $IDLETIME}
;;
*) DEMAND="";;
esac
MTU=$(nvram get ppp_mtu)
MTU=${MTU:-1492}
ifconfig $IFNAME up ifconfig $IFNAME up
/usr/sbin/pppd nodetach \ /usr/sbin/pppd nodetach \
plugin rp-pppoe.so \ plugin rp-pppoe.so \
connect /bin/true \ connect /bin/true \
usepeerdns \ usepeerdns \
defaultroute \ defaultroute \
linkname $type \ linkname $type \
ipparam $type \ ipparam $type \
user "$USERNAME" \ user "$USERNAME" \
password "$PASSWORD" \ password "$PASSWORD" \
mtu $MTU mru $MTU \ mtu $MTU mru $MTU \
$IDLETIME \ $DEMAND \
$REDIAL \ $KEEPALIVE \
nic-$IFNAME nic-$IFNAME
# Read settings again (might have changed) # Read settings again (might have changed)
[ -e /etc/config/network ] && . /etc/config/network [ -e /etc/config/network ] && . /etc/config/network
done & done &