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

SVN-Revision: 21563
This commit is contained in:
Jo-Philipp Wich 2010-05-24 16:28:46 +00:00
parent 338f1af5f3
commit a93571825f
2 changed files with 11 additions and 2 deletions

View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=pptp PKG_NAME:=pptp
PKG_VERSION:=1.7.1 PKG_VERSION:=1.7.1
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/pptpclient PKG_SOURCE_URL:=@SF/pptpclient

View file

@ -14,10 +14,19 @@ setup_interface_pptp() {
local config="$2" local config="$2"
local ifname local ifname
local device
config_get device "$config" device config_get device "$config" device
local ipproto
config_get ipproto "$config" ipproto config_get ipproto "$config" ipproto
local server
config_get server "$config" 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 for module in slhc ppp_generic ppp_async ip_gre; do
/sbin/insmod $module 2>&- >&- /sbin/insmod $module 2>&- >&-
done done
@ -37,7 +46,7 @@ setup_interface_pptp() {
config_get mtu "$config" mtu config_get mtu "$config" mtu
mtu=${mtu:-1452} mtu=${mtu:-1452}
start_pppd "$config" \ 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 \ file /etc/ppp/options.pptp \
mtu $mtu mru $mtu mtu $mtu mru $mtu
} }