ikev1: Fix calculation of DPD timeout

A DPD timeout job is queued whenever a DPD is sent, i.e. after the
DPD delay already has elapsed, so we have to compensate for that.

diff --git a/src/libcharon/sa/ikev1/task_manager_v1.c b/src/libcharon/sa/ikev1/task_manager_v1.c
index a839f51e776f2680d78c1d693c182bbb32bf1345..3c601a4fa7d5860a225d8d9e64698b1fc88e6eee 100644 (file)
--- a/src/libcharon/sa/ikev1/task_manager_v1.c
+++ b/src/libcharon/sa/ikev1/task_manager_v1.c
@@ -1802,6 +1802,8 @@ METHOD(task_manager_t, queue_dpd, void,
                                                        pow(this->retransmit_base, retransmit));
                }
        }
+       /* compensate for the already elapsed dpd delay */
+       t -= 1000 * peer_cfg->get_dpd(peer_cfg);
 
        /* schedule DPD timeout job */
        lib->scheduler->schedule_job_ms(lib->scheduler,