aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-05-24 16:28:46 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-05-24 16:28:46 +0000
commita93571825f040d24c12c6071dab32a5d98018091 (patch)
tree769516b4457c916b620f1cc517547cc03ba68c55
parent338f1af5f38cfefec48a5554dcf9f89191fc4041 (diff)
downloadupstream-a93571825f040d24c12c6071dab32a5d98018091.tar.gz
upstream-a93571825f040d24c12c6071dab32a5d98018091.tar.bz2
upstream-a93571825f040d24c12c6071dab32a5d98018091.zip
pptp: add "buffering" uci option to enable --nobuffer if needed (#7080)
SVN-Revision: 21563
-rw-r--r--package/pptp/Makefile2
-rw-r--r--package/pptp/files/pptp.sh11
2 files changed, 11 insertions, 2 deletions
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
}