From c5786e4186cabb6801448eff50e26026a8b461b3 Mon Sep 17 00:00:00 2001 From: Guillaume Nault Date: Fri, 7 Sep 2012 12:35:05 +0200 Subject: L2TP: Start sending HELLO messages upon tunnel connection Make HELLO messages independent from PPP connections (HELLO messages are tunnel specific). Signed-off-by: Guillaume Nault --- accel-pppd/ctrl/l2tp/l2tp.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/accel-pppd/ctrl/l2tp/l2tp.c b/accel-pppd/ctrl/l2tp/l2tp.c index 763fa2c4..3c38bfa9 100644 --- a/accel-pppd/ctrl/l2tp/l2tp.c +++ b/accel-pppd/ctrl/l2tp/l2tp.c @@ -269,14 +269,7 @@ static int l2tp_session_disconnect(struct l2tp_conn_t *conn, static void l2tp_ppp_started(struct ap_session *ses) { - struct ppp_t *ppp = container_of(ses, typeof(*ppp), ses); - struct l2tp_sess_t *sess = container_of(ppp, typeof(*sess), ppp); - struct l2tp_conn_t *conn = sess->paren_conn; - log_ppp_debug("l2tp: ppp started\n"); - - if (conf_hello_interval) - triton_timer_add(&conn->ctx, &conn->hello_timer, 0); } static void l2tp_ppp_finished(struct ap_session *ses) @@ -558,6 +551,9 @@ static int l2tp_tunnel_connect(struct l2tp_conn_t *conn) goto out_err; } + if (conf_hello_interval) + triton_timer_add(&conn->ctx, &conn->hello_timer, 0); + return 0; out_err: -- cgit v1.2.3