Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

xl2tpd: remove demand support from netifd l2tp protocol

Browse source 
This pppd feature does not make sense in L2TP case because the
tunnel is already connected when xl2tpd launch pppd process. If
a dial-on-demand feature is to be implemented, trigger interface
would have to be provided by xl2tpd, not pppd.

Signed-off-by: Alin Nastac <alin.nastac@gmail.com>
This commit is contained in:
Alin Nastac 2017-12-18 13:31:16 +01:00 committed by Yousong Zhou
parent 13cbaf8541
commit c59bea9f43
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/xl2tpd/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=xl2tpd
PKG_VERSION:=1.3.10
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_MAINTAINER:=Yousong Zhou <yszhou4tech@gmail.com>
PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=LICENSE

10
net/xl2tpd/files/l2tp.sh
View file

@ -14,7 +14,6 @@ proto_l2tp_init_config() {
proto_config_add_string "keepalive"
proto_config_add_string "pppd_options"
proto_config_add_boolean "ipv6"
proto_config_add_int "demand"
proto_config_add_int "mtu"
proto_config_add_int "checkup_interval"
proto_config_add_string "server"
@ -58,14 +57,9 @@ proto_l2tp_setup() {
done
fi
local ipv6 demand keepalive username password pppd_options mtu
json_get_vars ipv6 demand keepalive username password pppd_options mtu
local ipv6 keepalive username password pppd_options mtu
json_get_vars ipv6 keepalive username password pppd_options mtu
[ "$ipv6" = 1 ] || ipv6=""
if [ "${demand:-0}" -gt 0 ]; then
demand="precompiled-active-filter /etc/ppp/filter demand idle $demand"
else
demand="persist"
fi
local interval="${keepalive##*[, ]}"
[ "$interval" != "$keepalive" ] || interval=5