trigger error if dport is used when no proto is defined

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

diff --git a/package/pptp/files/pptp.sh b/package/pptp/files/pptp.sh
index fffa625..ba0e376 100644 (file)
--- a/package/pptp/files/pptp.sh
+++ b/package/pptp/files/pptp.sh
@@ -2,22 +2,44 @@ scan_pptp() {
        scan_ppp "$@"
 }
 
        scan_ppp "$@"
 }
 

+find_gw() {
+       route -n | awk '$1 == "0.0.0.0" { print $2; exit }'
+}
+
+

 setup_interface_pptp() {
 setup_interface_pptp() {

-       local iface="$1"

        local config="$2"
        local config="$2"

+       local ifname

        
        config_get device "$config" device
        
        config_get device "$config" device

+       config_get ipproto "$config" ipproto
+       config_get server "$cfg" server

 
        for module in slhc ppp_generic ppp_async ip_gre; do
                /sbin/insmod $module 2>&- >&-
        done
 
        for module in slhc ppp_generic ppp_async ip_gre; do
                /sbin/insmod $module 2>&- >&-
        done

-       setup_interface "$iface" "$config" "dhcp"
+       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"
+       }
+
+       # 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 "$cfg" mtu

-       config_get server "$cfg" server

        mtu=${mtu:-1452}
        start_pppd "$config" \
        mtu=${mtu:-1452}
        start_pppd "$config" \

-               pty "/usr/sbin/pptp $server --loglevel 0 --nolaunchpppd"
-               file /etc/ppp/options.pptp
+               pty "/usr/sbin/pptp $server --loglevel 0 --nolaunchpppd" \
+               file /etc/ppp/options.pptp \

                mtu $mtu mru $mtu
 }
                mtu $mtu mru $mtu
 }