pptp: add "buffering" uci option to enable --nobuffer if needed (#7080)
authorJo-Philipp Wich <jow@openwrt.org>
Mon, 24 May 2010 16:28:46 +0000 (16:28 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Mon, 24 May 2010 16:28:46 +0000 (16:28 +0000)
SVN-Revision: 21563

package/pptp/Makefile
package/pptp/files/pptp.sh

index ba55c75..018e9b5 100644 (file)
@@ -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
index b5a5c06..c95895d 100644 (file)
@@ -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
 }