summaryrefslogtreecommitdiff
path: root/sbin/iked/config.c
diff options
context:
space:
mode:
authorTobias Heider <tobhe@cvs.openbsd.org>2022-05-08 20:26:32 +0000
committerTobias Heider <tobhe@cvs.openbsd.org>2022-05-08 20:26:32 +0000
commiteeebd538ad9829cb914562eabddc26d8907a2bcd (patch)
treec6e0f8851f4a2cd2e9e810c29bac1366f638003d /sbin/iked/config.c
parent9fe158d04a5fd7bb7761561a52831975b583f3d8 (diff)
Move ikev2_reset_alive_timer() to a place where it makes more sense. The idea
is to renew the timer every time sc_alive_timeout is reset after loading a new config. ok patrick@
Diffstat (limited to 'sbin/iked/config.c')
-rw-r--r--sbin/iked/config.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sbin/iked/config.c b/sbin/iked/config.c
index 878be2a3715..1f9cee7c8b4 100644
--- a/sbin/iked/config.c
+++ b/sbin/iked/config.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: config.c,v 1.84 2021/11/25 18:28:51 tobhe Exp $ */
+/* $OpenBSD: config.c,v 1.85 2022/05/08 20:26:31 tobhe Exp $ */
/*
* Copyright (c) 2019 Tobias Heider <tobias.heider@stusta.de>
@@ -902,6 +902,8 @@ config_getstatic(struct iked *env, struct imsg *imsg)
log_debug("%s: %sstickyaddress", __func__,
env->sc_stickyaddress ? "" : "no ");
+ ikev2_reset_alive_timer(env);
+
return (0);
}
@@ -1071,7 +1073,5 @@ config_getkey(struct iked *env, struct imsg *imsg)
explicit_bzero(imsg->data, len);
ca_getkey(&env->sc_ps, &id, imsg->hdr.type);
- ikev2_reset_alive_timer(env);
-
return (0);
}