[package] pptp: don't remove server route if the gateway is 0.0.0.0, this fixes a...

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

diff --git a/package/pptp/files/pptp.sh b/package/pptp/files/pptp.sh
index e38c242..b5a5c06 100644 (file)
--- a/package/pptp/files/pptp.sh
+++ b/package/pptp/files/pptp.sh
@@ -1,16 +1,19 @@
-scan_pptp() {
-       scan_ppp "$@"
-}
-
 find_gw() {
        route -n | awk '$1 == "0.0.0.0" { print $2; exit }'
 }
 
+stop_interface_pptp() {
+       stop_interface_ppp "$1"
+}
+
+coldplug_interface_pptp() {
+       setup_interface_pptp "pptp-$1" "$1"
+}
 
 setup_interface_pptp() {
        local config="$2"
        local ifname
-       
+
        config_get device "$config" device
        config_get ipproto "$config" ipproto
        config_get server "$config" server
@@ -23,7 +26,7 @@ setup_interface_pptp() {
        setup_interface "$device" "$config" "${ipproto:-dhcp}"
        local gw="$(find_gw)"
        [ -n "$gw" ] && {
-               route delete "$server" 2>/dev/null >/dev/null
+               [ "$gw" != 0.0.0.0 ] && route delete "$server" 2>/dev/null >/dev/null
                route add "$server" gw "$gw"
        }
 
@@ -31,11 +34,6 @@ setup_interface_pptp() {
        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 "$config" mtu
        mtu=${mtu:-1452}
        start_pppd "$config" \