acx-mac80211 fixes:

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

diff --git a/package/pptp/files/pptp.sh b/package/pptp/files/pptp.sh
index 7847802..4d03af0 100644 (file)
--- a/package/pptp/files/pptp.sh
+++ b/package/pptp/files/pptp.sh
@@ -1,22 +1,24 @@
-scan_pppoe() {
+scan_pptp() {

        scan_ppp "$@"
 }
 
        scan_ppp "$@"
 }
 

-setup_interface_pppoe() {
+setup_interface_pptp() {

        local iface="$1"
        local config="$2"
        
        config_get device "$config" device
        local iface="$1"
        local config="$2"
        
        config_get device "$config" device

+       config_get ipproto "$config" ipproto

 
        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"
+       setup_interface "$iface" "$config" "${ipproto:-dhcp}"

 
        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" \

-               plugin rp-pppoe.so \
-               mtu $mtu mru $mtu \
-               "nic-$device"
+               pty "/usr/sbin/pptp $server --loglevel 0 --nolaunchpppd" \
+               file /etc/ppp/options.pptp \
+               mtu $mtu mru $mtu

 }
 }