From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 24 May 2010 16:28:46 +0000 (+0000)
Subject: pptp: add "buffering" uci option to enable --nobuffer if needed (#7080)
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a93571825f040d24c12c6071dab32a5d98018091;p=openwrt%2Fstaging%2Fstintel.git

pptp: add "buffering" uci option to enable --nobuffer if needed (#7080)

SVN-Revision: 21563
---

diff --git a/package/pptp/Makefile b/package/pptp/Makefile
index ba55c7515d..018e9b570e 100644
--- a/package/pptp/Makefile
+++ b/package/pptp/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pptp
 PKG_VERSION:=1.7.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/pptpclient
diff --git a/package/pptp/files/pptp.sh b/package/pptp/files/pptp.sh
index b5a5c06d07..c95895d9fa 100644
--- a/package/pptp/files/pptp.sh
+++ b/package/pptp/files/pptp.sh
@@ -14,10 +14,19 @@ setup_interface_pptp() {
 	local config="$2"
 	local ifname
 
+	local device
 	config_get device "$config" device
+
+	local ipproto
 	config_get ipproto "$config" ipproto
+
+	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
@@ -37,7 +46,7 @@ setup_interface_pptp() {
 	config_get mtu "$config" mtu
 	mtu=${mtu:-1452}
 	start_pppd "$config" \
-		pty "/usr/sbin/pptp $server --loglevel 0 --nolaunchpppd" \
+		pty "/usr/sbin/pptp $server --loglevel 0 --nolaunchpppd $buffering" \
 		file /etc/ppp/options.pptp \
 		mtu $mtu mru $mtu
 }