summaryrefslogtreecommitdiff
path: root/accel-pppd
diff options
context:
space:
mode:
authorGuillaume Nault <g.nault@alphalink.fr>2012-09-07 12:35:05 +0200
committerKozlov Dmitry <xeb@mail.ru>2012-09-07 14:50:32 +0400
commitc5786e4186cabb6801448eff50e26026a8b461b3 (patch)
treee73c1523c83338d55dbdc174d3ebde6a5d23a41b /accel-pppd
parent42773137107417ded0086d525b34b1255aca3e11 (diff)
downloadaccel-ppp-c5786e4186cabb6801448eff50e26026a8b461b3.tar.gz
accel-ppp-c5786e4186cabb6801448eff50e26026a8b461b3.zip
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 <g.nault@alphalink.fr>
Diffstat (limited to 'accel-pppd')
-rw-r--r--accel-pppd/ctrl/l2tp/l2tp.c10
1 files 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: