From: Tobias Brunner <tobias@strongswan.org>
Date: Mon, 1 Feb 2016 14:29:25 +0000 (+0100)
Subject: peer-cfg: Set DPD timeout to at least DPD delay
X-Git-Tag: 5.4.0dr6~10
X-Git-Url: https://git.strongswan.org/?p=strongswan.git;a=commitdiff_plain;h=b4ae9e81f5a457894313b365f1bbcc24c35cbbcc

peer-cfg: Set DPD timeout to at least DPD delay

If DPD timeout is set but to a value smaller than the DPD delay the code
in task_manager_v1.c:queue_liveliness_check will run into an integer
underrun.
---

diff --git a/src/libcharon/config/peer_cfg.c b/src/libcharon/config/peer_cfg.c
index aa2a39c..8a8c5b7 100644
--- a/src/libcharon/config/peer_cfg.c
+++ b/src/libcharon/config/peer_cfg.c
@@ -666,6 +666,10 @@ peer_cfg_t *peer_cfg_create(char *name,
 	{
 		jitter_time = reauth_time;
 	}
+	if (dpd && dpd_timeout && dpd > dpd_timeout)
+	{
+		dpd_timeout = dpd;
+	}
 
 	INIT(this,
 		.public = {