[backfire] merge r27669

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

diff --git a/package/pptp/files/pptp.sh b/package/pptp/files/pptp.sh
index 436bee3c8763dd79c474cede47ef14181365feb8..7efbb02fb8e5357d068153deb5459cf33681c3f4 100644 (file)
--- a/package/pptp/files/pptp.sh
+++ b/package/pptp/files/pptp.sh
@@ -8,6 +8,9 @@ scan_pptp() {
 
 stop_interface_pptp() {
        stop_interface_ppp "$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() {
 }
 
 coldplug_interface_pptp() {


@@ -39,8 +42,13 @@ setup_interface_pptp() {
        setup_interface "$device" "$config" "${ipproto:-dhcp}"
        local gw="$(find_gw)"
        [ -n "$gw" ] && {
        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
        }
 
        # fix up the netmask