[kernel/3.3] add missing INET_UDP_DIAG symbol

[openwrt.git] / package / pptp / files / pptp.sh

diff --git a/package/pptp/files/pptp.sh b/package/pptp/files/pptp.sh
index c95895d..19023e7 100644 (file)
--- a/package/pptp/files/pptp.sh
+++ b/package/pptp/files/pptp.sh
@@ -2,8 +2,15 @@ find_gw() {
        route -n | awk '$1 == "0.0.0.0" { print $2; exit }'
 }
 
+scan_pptp() {
+       config_set "$1" device "pptp-$1"
+}
+
 stop_interface_pptp() {
        stop_interface_ppp "$1"
+       for ip in $(uci_get_state network "$1" serv_addrs); do
+               route del -host "$ip" 2>/dev/null
+       done
 }
 
 coldplug_interface_pptp() {
@@ -17,9 +24,6 @@ setup_interface_pptp() {
        local device
        config_get device "$config" device
 
-       local ipproto
-       config_get ipproto "$config" ipproto
-
        local server
        config_get server "$config" server
 
@@ -32,11 +36,15 @@ setup_interface_pptp() {
        done
        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"
+               local serv_addrs=""
+               for ip in $(resolveip -4 -t 3 "$server"); do
+                       append serv_addrs "$ip"
+                       route delete -host "$ip" 2>/dev/null
+                       route add -host "$ip" gw "$gw"
+               done
+               uci_toggle_state network "$config" serv_addrs "$serv_addrs"
        }
 
        # fix up the netmask