[adm5120] add kernel config option to disabling common PCI quirks, resync kernel...

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

diff --git a/package/pptp/files/pptp.sh b/package/pptp/files/pptp.sh
index 7847802..f1c46c9 100644 (file)
--- a/package/pptp/files/pptp.sh
+++ b/package/pptp/files/pptp.sh
@@ -1,22 +1,35 @@
-scan_pppoe() {
+scan_pptp() {
        scan_ppp "$@"
 }
 
-setup_interface_pppoe() {
-       local iface="$1"
+setup_interface_pptp() {
        local config="$2"
+       local ifname
        
        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
-       setup_interface "$iface" "$config" "dhcp"
+       sleep 1
+
+       setup_interface "$device" "$config" "${ipproto:-dhcp}"
+
+       # 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 "/var/state/network.$config.ifname=$ifname"
 
        config_get mtu "$cfg" mtu
+       config_get server "$cfg" server
        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
 }