X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/0bb68e81eca839c8eed0c629b403ac558ea662e6..3830e0d317c429f3770f6c36977cb6984d102602:/package/pptp/files/ifup.pptp

diff --git a/package/pptp/files/ifup.pptp b/package/pptp/files/ifup.pptp
index acaeabd97..f401a36b2 100644
--- a/package/pptp/files/ifup.pptp
+++ b/package/pptp/files/ifup.pptp
@@ -1,50 +1,45 @@
 #!/bin/sh
-. /etc/functions.sh
+[ $# = 0 ] && { echo "  $0 <group>"; exit; }
+. /etc/config/network
 type=$1
 
-[ "$(nvram get ${type}_proto)" = "pptp" ] || exit
+eval "proto=\"\${${type}_proto}\""
+[ "$proto" = "pptp" ] || {
+	echo "$0: ${type}_proto isn't pptp"
+	exit
+}
 
-[ -d "/var/lock" ] || mkdir -p /var/lock || exit 1
+mkdir -p /var/lock
 
 for module in slhc ppp_generic ppp_async ip_gre; do
 	/sbin/insmod $module 2>&- >&-
 done
 
-while :; do
-	PPTP_PROTO="$(nvram get pptp_proto)"
-	[ "$PPTP_PROTO" = "static" ] || PPTP_PROTO=""
-	PPTP_PROTO="${PPTP_PROTO:-dhcp}"
-	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}
-	MTU=$(nvram get ppp_mtu)
-	MTU=${MTU:-1452}
+KEEPALIVE=${ppp_redialperiod:+lcp-echo-interval $ppp_redialperiod lcp-echo-failure 5}
+case "$ppp_demand" in
+	on|1|enabled)
+		DEMAND=${ppp_idletime:+demand idle $ppp_idletime}
+		[ -f /etc/ppp/filter ] && DEMAND=${DEMAND:+precompiled-active-filter /etc/ppp/filter $DEMAND}
+	;;
+	*) DEMAND="persist";;
+esac
+MTU=${ppp_mtu:-1452}
 
-	do_ifup $PPTP_PROTO $type
-	
-	# hack for some buggy ISPs
-	NETMASK=$(nvram get ${type}_netmask)
-	IFNAME=$(nvram get pptp_ifname)
-	[ -z "$NETMASK" -o -z "$IFNAME" ] || ifconfig $IFNAME netmask $NETMASK
+[ "$pptp_proto" = "static" ] || pptp_proto="dhcp"
+do_ifup $pptp_proto $type
 
-	/usr/sbin/pppd nodetach \
-		pty "/usr/sbin/pptp $IP --loglevel 0 --nolaunchpppd" \
-		file /etc/ppp/options.pptp \
-		connect /bin/true \
-		usepeerdns \
-		defaultroute \
-		replacedefaultroute \
-		linkname "$type" \
-		ipparam "$type" \
-		user "$USERNAME" \
-		password "$PASSWORD" \
-		mtu $MTU \
-		mru $MTU \
-		$IDLETIME \
-		$REDIAL
-done &
+/usr/sbin/pppd \
+	pty "/usr/sbin/pptp $pptp_server_ip --loglevel 0 --nolaunchpppd" \
+	file /etc/ppp/options.pptp \
+	connect /bin/true \
+	usepeerdns \
+	defaultroute \
+	replacedefaultroute \
+	linkname "$type" \
+	ipparam "$type" \
+	user "$ppp_username" \
+	password "$ppp_passwd" \
+	mtu $MTU mru $MTU \
+	$DEMAND \
+	$KEEPALIVE