[rdc] base-files: gracefully handle empty variables in preinit (#11155)

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

diff --git a/package/pptp/files/pptp.sh b/package/pptp/files/pptp.sh
index 7847802..19023e7 100644 (file)
--- a/package/pptp/files/pptp.sh
+++ b/package/pptp/files/pptp.sh
@@ -1,22 +1,60 @@
-scan_pppoe() {
-       scan_ppp "$@"
+find_gw() {
+       route -n | awk '$1 == "0.0.0.0" { print $2; exit }'
 }
 
-setup_interface_pppoe() {
-       local iface="$1"
+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() {
+       setup_interface_pptp "pptp-$1" "$1"
+}
+
+setup_interface_pptp() {
        local config="$2"
-       
+       local ifname
+
+       local device
        config_get device "$config" device
 
+       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
-       setup_interface "$iface" "$config" "dhcp"
+       sleep 1
+
+       local gw="$(find_gw)"
+       [ -n "$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
+       config_get netmask "$config" netmask
+       [ -z "$netmask" -o -z "$device" ] || ifconfig $device netmask $netmask
 
-       config_get mtu "$cfg" mtu
+       config_get mtu "$config" mtu
        mtu=${mtu:-1452}
        start_pppd "$config" \
-               plugin rp-pppoe.so \
-               mtu $mtu mru $mtu \
-               "nic-$device"
+               pty "/usr/sbin/pptp $server --loglevel 0 --nolaunchpppd $buffering" \
+               file /etc/ppp/options.pptp \
+               mtu $mtu mru $mtu
 }