X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/c4f3575368c5aeef4134d82125df2814d688cc2a..f84043cb6a26b0761008efa98fe9d52fd2dc63c6:/package/pptp/files/pptp.sh

diff --git a/package/pptp/files/pptp.sh b/package/pptp/files/pptp.sh
index 784780204..4d03af008 100644
--- a/package/pptp/files/pptp.sh
+++ b/package/pptp/files/pptp.sh
@@ -1,22 +1,24 @@
-scan_pppoe() {
+scan_pptp() {
 	scan_ppp "$@"
 }
 
-setup_interface_pppoe() {
+setup_interface_pptp() {
 	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
-	setup_interface "$iface" "$config" "dhcp"
+	setup_interface "$iface" "$config" "${ipproto:-dhcp}"
 
 	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
 }