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 aa2a39ce59d256f544de2c78d51255d7f31959a5..8a8c5b7a5d0e52c550bcfd24cd38222ac4ee9f9d 100644 (file)
--- 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 = {