Revert "xl2tpd: rename netifd protocol handler to l2tpv2 to avoid clashes with l2tpv3"

This reverts commit 981f2da457.
OpenWrt wiki knew l2tp from l2tpv3tun, but luci knew l2tp from xl2tpd
pull/216/head
Steven Barth 2014-08-18 11:36:19 +02:00
parent 21bbbcde12
commit 96b04afce6
2 changed files with 5 additions and 5 deletions

View File

@ -67,7 +67,7 @@ define Package/xl2tpd/install
$(INSTALL_DATA) ./files/options.xl2tpd $(1)/etc/ppp/
$(INSTALL_DIR) $(1)/lib/netifd/proto
$(INSTALL_BIN) ./files/l2tpv2.sh $(1)/lib/netifd/proto
$(INSTALL_BIN) ./files/l2tp.sh $(1)/lib/netifd/proto
endef
$(eval $(call BuildPackage,xl2tpd))

View File

@ -8,7 +8,7 @@
init_proto "$@"
}
proto_l2tpv2_init_config() {
proto_l2tp_init_config() {
proto_config_add_string "username"
proto_config_add_string "password"
proto_config_add_string "keepalive"
@ -20,7 +20,7 @@ proto_l2tpv2_init_config() {
no_device=1
}
proto_l2tpv2_setup() {
proto_l2tp_setup() {
local config="$1"
local iface="$2"
local optfile="/tmp/l2tp/options.${config}"
@ -77,7 +77,7 @@ proto_l2tpv2_setup() {
xl2tpd-control connect l2tp-${config}
}
proto_l2tpv2_teardown() {
proto_l2tp_teardown() {
local interface="$1"
local optfile="/tmp/l2tp/options.${interface}"
@ -103,5 +103,5 @@ proto_l2tpv2_teardown() {
}
[ -n "$INCLUDE_ONLY" ] || {
add_protocol l2tpv2
add_protocol l2tp
}