[package] pptp: remove support for underlying ipproto, it is adviced since a while...

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

diff --git a/package/pptp/files/pptp.sh b/package/pptp/files/pptp.sh
index b5a5c06..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() {
@@ -14,20 +21,30 @@ setup_interface_pptp() {
        local config="$2"
        local ifname
 
+       local device
        config_get device "$config" device
-       config_get ipproto "$config" ipproto
+
+       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" ] && {
-               [ "$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
@@ -37,7 +54,7 @@ setup_interface_pptp() {
        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
 }