X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=package%2Fpptp%2Ffiles%2Fpptp.sh;h=436bee3c8763dd79c474cede47ef14181365feb8;hp=c61bdc02062ace29113186f1ce1979c7bcaf3004;hb=9852cebbe9af209bf5afd0e0f328d0693d9ee816;hpb=e5e6f464cb57ff5a4a3184b7e95a8f3083a73771

diff --git a/package/pptp/files/pptp.sh b/package/pptp/files/pptp.sh
index c61bdc0206..436bee3c87 100644
--- a/package/pptp/files/pptp.sh
+++ b/package/pptp/files/pptp.sh
@@ -1,23 +1,56 @@
+find_gw() {
+	route -n | awk '$1 == "0.0.0.0" { print $2; exit }'
+}
+
 scan_pptp() {
-	scan_ppp "$@"
+	config_set "$1" device "pptp-$1"
+}
+
+stop_interface_pptp() {
+	stop_interface_ppp "$1"
+}
+
+coldplug_interface_pptp() {
+	setup_interface_pptp "pptp-$1" "$1"
 }
 
 setup_interface_pptp() {
-	local iface="$1"
 	local config="$2"
-	
+	local ifname
+
+	local device
 	config_get device "$config" device
 
+	local ipproto
+	config_get ipproto "$config" ipproto
+
+	local server
+	config_get server "$config" server
+
+	local buffering
+	config_get_bool buffering "$config" buffering 1
+	[ "$buffering" == 0 ] && buffering="--nobuffer" || buffering=
+
 	for module in slhc ppp_generic ppp_async ip_gre; do
 		/sbin/insmod $module 2>&- >&-
 	done
-	setup_interface "$iface" "$config" "dhcp"
+	sleep 1
+
+	setup_interface "$device" "$config" "${ipproto:-dhcp}"
+	local gw="$(find_gw)"
+	[ -n "$gw" ] && {
+		[ "$gw" != 0.0.0.0 ] && route delete "$server" 2>/dev/null >/dev/null
+		route add "$server" gw "$gw"
+	}
+
+	# fix up the netmask
+	config_get netmask "$config" netmask
+	[ -z "$netmask" -o -z "$device" ] || ifconfig $device netmask $netmask
 
-	config_get mtu "$cfg" mtu
-	config_get server "$cfg" server
+	config_get mtu "$config" mtu
 	mtu=${mtu:-1452}
 	start_pppd "$config" \
-		pty "/usr/sbin/pptp $server --loglevel 0 --nolaunchpppd" \
+		pty "/usr/sbin/pptp $server --loglevel 0 --nolaunchpppd $buffering" \
 		file /etc/ppp/options.pptp \
 		mtu $mtu mru $mtu
 }