X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/866696c182185ed17346d2d59e2c18020f729224..b4667d52b090ed70c1bd2a50d24e90a0d25bbb84:/package/pptp/files/pptp.sh

diff --git a/package/pptp/files/pptp.sh b/package/pptp/files/pptp.sh
index f1c46c9a3..ba0e37669 100644
--- a/package/pptp/files/pptp.sh
+++ b/package/pptp/files/pptp.sh
@@ -2,12 +2,18 @@ scan_pptp() {
 	scan_ppp "$@"
 }
 
+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>&- >&-
@@ -15,6 +21,11 @@ setup_interface_pptp() {
 	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
@@ -23,10 +34,9 @@ setup_interface_pptp() {
 	# make sure the network state references the correct ifname
 	scan_ppp "$config"
 	config_get ifname "$config" ifname
-	uci set "/var/state/network.$config.ifname=$ifname"
+	uci_set_state network "$config" ifname "$ifname"
 
 	config_get mtu "$cfg" mtu
-	config_get server "$cfg" server
 	mtu=${mtu:-1452}
 	start_pppd "$config" \
 		pty "/usr/sbin/pptp $server --loglevel 0 --nolaunchpppd" \