summaryrefslogtreecommitdiff
path: root/sbin/iked/ikev2.c
diff options
context:
space:
mode:
authortobhe <tobhe@cvs.openbsd.org>2020-08-25 15:08:09 +0000
committertobhe <tobhe@cvs.openbsd.org>2020-08-25 15:08:09 +0000
commit02c74a75a370179b6764962e426f9c9f2fd9eaff (patch)
tree46068b3e9a2ea9416b8ae62a7a3b3d2c5e80f1cf /sbin/iked/ikev2.c
parentaed1bc55800be23dd5d00d34ca73fbb1027c5ea5 (diff)
Add dpd_check_interval configuration option. If for any IKE SA no IPsec
or IKE message has been received within the specified time interval, iked will start sending DPD messages. ok patrick@
Diffstat (limited to 'sbin/iked/ikev2.c')
-rw-r--r--sbin/iked/ikev2.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sbin/iked/ikev2.c b/sbin/iked/ikev2.c
index 83f7f6c1d14..e8f4fa429b2 100644
--- a/sbin/iked/ikev2.c
+++ b/sbin/iked/ikev2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ikev2.c,v 1.248 2020/08/24 21:00:21 tobhe Exp $ */
+/* $OpenBSD: ikev2.c,v 1.249 2020/08/25 15:08:08 tobhe Exp $ */
/*
* Copyright (c) 2019 Tobias Heider <tobias.heider@stusta.de>
@@ -1428,7 +1428,7 @@ ikev2_enable_timer(struct iked *env, struct iked_sa *sa)
{
sa->sa_last_recvd = gettime();
timer_set(env, &sa->sa_timer, ikev2_ike_sa_alive, sa);
- timer_add(env, &sa->sa_timer, IKED_IKE_SA_ALIVE_TIMEOUT);
+ timer_add(env, &sa->sa_timer, env->sc_alive_timeout);
timer_set(env, &sa->sa_keepalive, ikev2_ike_sa_keepalive, sa);
if (sa->sa_usekeepalive)
timer_add(env, &sa->sa_keepalive,
@@ -4479,7 +4479,7 @@ ikev2_ike_sa_alive(struct iked *env, void *arg)
__func__,
csa->csa_dir == IPSP_DIRECTION_IN ? "incoming" : "outgoing",
print_spi(csa->csa_spi.spi, csa->csa_spi.spi_size), diff);
- if (diff < IKED_IKE_SA_ALIVE_TIMEOUT) {
+ if (diff < env->sc_alive_timeout) {
if (csa->csa_dir == IPSP_DIRECTION_IN) {
foundin = 1;
break;
@@ -4512,7 +4512,7 @@ ikev2_ike_sa_alive(struct iked *env, void *arg)
}
/* re-register */
- timer_add(env, &sa->sa_timer, IKED_IKE_SA_ALIVE_TIMEOUT);
+ timer_add(env, &sa->sa_timer, env->sc_alive_timeout);
}
void