X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fpptp%2Ffiles%2Fpptp.sh;h=ba0e3766957309f5bcbc49f277eabbff06456522;hb=8e2cf077d0066a626bf3b90596acd941f430fe9e;hp=7847802041bfae1bdd7da759f3618f4ca27ece90;hpb=c4f3575368c5aeef4134d82125df2814d688cc2a;p=openwrt-10.03%2F.git

diff --git a/package/pptp/files/pptp.sh b/package/pptp/files/pptp.sh
index 784780204..ba0e37669 100644
--- a/package/pptp/files/pptp.sh
+++ b/package/pptp/files/pptp.sh
@@ -1,22 +1,45 @@
-scan_pppoe() {
+scan_pptp() {
 	scan_ppp "$@"
 }
 
-setup_interface_pppoe() {
-	local iface="$1"
+find_gw() {
+	route -n | awk '$1 == "0.0.0.0" { print $2; exit }'
+}
+
+
+setup_interface_pptp() {
 	local config="$2"
+	local ifname
 	
 	config_get device "$config" device
+	config_get ipproto "$config" ipproto
+	config_get server "$cfg" server
 
 	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" ] && {
+		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
+
+	# make sure the network state references the correct ifname
+	scan_ppp "$config"
+	config_get ifname "$config" ifname
+	uci_set_state network "$config" ifname "$ifname"
 
 	config_get mtu "$cfg" mtu
 	mtu=${mtu:-1452}
 	start_pppd "$config" \
-		plugin rp-pppoe.so \
-		mtu $mtu mru $mtu \
-		"nic-$device"
+		pty "/usr/sbin/pptp $server --loglevel 0 --nolaunchpppd" \
+		file /etc/ppp/options.pptp \
+		mtu $mtu mru $mtu
 }