aboutsummaryrefslogtreecommitdiffstats
path: root/src/libcharon/config
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2016-02-01 15:29:25 +0100
committerTobias Brunner <tobias@strongswan.org>2016-02-01 15:29:25 +0100
commitb4ae9e81f5a457894313b365f1bbcc24c35cbbcc (patch)
tree53681e1bf48f04113f15653e2fc249f52d4f905b /src/libcharon/config
parent24ab8530e5e6ec209aff5292026b7d1e84d5ccab (diff)
downloadstrongswan-b4ae9e81f5a457894313b365f1bbcc24c35cbbcc.tar.bz2
strongswan-b4ae9e81f5a457894313b365f1bbcc24c35cbbcc.tar.xz
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.
Diffstat (limited to 'src/libcharon/config')
-rw-r--r--src/libcharon/config/peer_cfg.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libcharon/config/peer_cfg.c b/src/libcharon/config/peer_cfg.c
index aa2a39ce5..8a8c5b7a5 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 = {