Fix pptp handling of routes to server.

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

diff --git a/package/pptp/files/pptp.sh b/package/pptp/files/pptp.sh
index ba0e3766957309f5bcbc49f277eabbff06456522..b898769b660e425f37a3c9d5b5d2e7f3a74e54e4 100644 (file)
--- a/package/pptp/files/pptp.sh
+++ b/package/pptp/files/pptp.sh
@@ -1,45 +1,58 @@
+find_route() {
+       ip route get $1 | sed -e 's/ /\n/g' | \
+            sed -ne '1p;/via/{N;p};/dev/{N;p};/src/{N;p};/mtu/{N;p}'
+}
+
 scan_pptp() {
-       scan_ppp "$@"
+       config_set "$1" device "pptp-$1"
 }
 
-find_gw() {
-       route -n | awk '$1 == "0.0.0.0" { print $2; exit }'
+stop_interface_pptp() {
+       stop_interface_ppp "$1"
+       for ip in $(uci_get_state network "$1" serv_addrs); do
+               ip route del "$ip" 2>/dev/null
+       done
 }
 
+coldplug_interface_pptp() {
+       setup_interface_pptp "pptp-$1" "$1"
+}
 
 setup_interface_pptp() {
        local config="$2"
        local ifname
-       
+
+       local device
        config_get device "$config" device
-       config_get ipproto "$config" ipproto
-       config_get server "$cfg" server
+
+       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
        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"
-       }
+       local serv_addrs=""
+       for ip in $(resolveip -t 3 "${server}"); do
+               append serv_addrs "$ip"
+               ip route replace $(find_route $ip)
+       done
+       uci_toggle_state network "$config" serv_addrs "$serv_addrs"
+}
 
        # 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
+       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
 }