4 files changed, 21 insertions, 5 deletions

diff --git a/accel-pppd/ctrl/l2tp/dict.c b/accel-pppd/ctrl/l2tp/dict.c
index c93ccd4..aaa7da4 100644
--- a/accel-pppd/ctrl/l2tp/dict.c
+++ b/accel-pppd/ctrl/l2tp/dict.c
@@ -257,7 +257,7 @@ static int l2tp_dict_load(const char *fname)
 	return r;
 }
 
-static void __init dict_init(void)
+static void dict_init(void)
 {
 	char *opt;
 
@@ -269,3 +269,4 @@ static void __init dict_init(void)
 		_exit(EXIT_FAILURE);
 }
 
+DEFINE_INIT(20, dict_init);
diff --git a/accel-pppd/ctrl/l2tp/l2tp.c b/accel-pppd/ctrl/l2tp/l2tp.c
index ca56051..c9ed08e 100644
--- a/accel-pppd/ctrl/l2tp/l2tp.c
+++ b/accel-pppd/ctrl/l2tp/l2tp.c
@@ -48,6 +48,7 @@ int conf_timeout = 60;
 int conf_rtimeout = 5;
 int conf_retransmit = 5;
 int conf_hello_interval = 60;
+int conf_dir300_quirk = 0;
 char *conf_host_name = NULL;
 
 static unsigned int stat_active;
@@ -300,6 +301,7 @@ static int l2tp_tunnel_alloc(struct l2tp_serv_t *serv, struct l2tp_packet_t *pac
 	conn->hello_timer.expire = l2tp_send_HELLO;
 	conn->hello_timer.period = conf_hello_interval * 1000;
 	conn->ctrl.ctx = &conn->ctx;
+	conn->ctrl.type = CTRL_TYPE_L2TP;
 	conn->ctrl.name = "l2tp";
 	conn->ctrl.started = l2tp_ppp_started;
 	conn->ctrl.finished = l2tp_ppp_finished;
@@ -838,7 +840,7 @@ static int l2tp_conn_read(struct triton_md_handler_t *h)
 		if (!pack)
 			continue;
 
-		if (ntohs(pack->hdr.tid) != conn->tid) {
+		if (ntohs(pack->hdr.tid) != conn->tid && (pack->hdr.tid || !conf_dir300_quirk)) {
 			if (conf_verbose)
 				log_warn("l2tp: incorrect tid %i in tunnel %i\n", ntohs(pack->hdr.tid), conn->tid);
 			l2tp_packet_free(pack);
@@ -1090,6 +1092,12 @@ static int show_stat_exec(const char *cmd, char * const *fields, int fields_cnt,
 	return CLI_CMD_OK;
 }
 
+void __export l2tp_get_stat(unsigned int **starting, unsigned int **active)
+{
+	*starting = &stat_starting;
+	*active = &stat_active;
+}
+
 static void load_config(void)
 {
 	char *opt;
@@ -1121,9 +1129,13 @@ static void load_config(void)
 		conf_host_name = _strdup(opt);
 	else
 		conf_host_name = NULL;
+	
+	opt = conf_get_opt("l2tp", "dir300_quirk");
+	if (opt)
+		conf_dir300_quirk = atoi(opt);
 }
 
-static void __init l2tp_init(void)
+static void l2tp_init(void)
 {
 	l2tp_conn = malloc(L2TP_MAX_TID * sizeof(void *));
 	memset(l2tp_conn, 0, L2TP_MAX_TID * sizeof(void *));
@@ -1139,3 +1151,4 @@ static void __init l2tp_init(void)
 	triton_event_register_handler(EV_CONFIG_RELOAD, (triton_event_func)load_config);
 }
 
+DEFINE_INIT(22, l2tp_init);
diff --git a/accel-pppd/ctrl/l2tp/netlink.c b/accel-pppd/ctrl/l2tp/netlink.c
index 7c8c79a..c8dce89 100644
--- a/accel-pppd/ctrl/l2tp/netlink.c
+++ b/accel-pppd/ctrl/l2tp/netlink.c
@@ -80,7 +80,7 @@ void l2tp_nl_create_session(int tid, int sid, int peer_sid)
 	nl_socket_free(nl_sock);
 }
 
-static void __init init(void)
+static void init(void)
 {
 	struct nl_sock *nl_sock = nl_socket_alloc();
 	
@@ -92,3 +92,4 @@ static void __init init(void)
 	nl_socket_free(nl_sock);
 }
 
+DEFINE_INIT(21, init);
diff --git a/accel-pppd/ctrl/l2tp/packet.c b/accel-pppd/ctrl/l2tp/packet.c
index e3f6896..d312118 100644
--- a/accel-pppd/ctrl/l2tp/packet.c
+++ b/accel-pppd/ctrl/l2tp/packet.c
@@ -485,10 +485,11 @@ int l2tp_packet_add_octets(struct l2tp_packet_t *pack, int id, const uint8_t *va
 	return 0;
 }
 
-static void __init init(void)
+static void init(void)
 {
 	attr_pool = mempool_create(sizeof(struct l2tp_attr_t));
 	pack_pool = mempool_create(sizeof(struct l2tp_packet_t));
 	buf_pool = mempool_create(L2TP_MAX_PACKET_SIZE);
 }
 
+DEFINE_INIT(21, init);