Setting message ID on task manager sets DPD sequence numbers in IKEv1

diff --git a/src/libcharon/sa/ikev1/task_manager_v1.c b/src/libcharon/sa/ikev1/task_manager_v1.c
index ac3824bc6153a3ea3657e68d8c8d24d4cb9ba82a..8ebaa9d8ed33563875df9f827283c44f0213e61a 100755 (executable)
--- a/src/libcharon/sa/ikev1/task_manager_v1.c
+++ b/src/libcharon/sa/ikev1/task_manager_v1.c
@@ -1393,6 +1393,14 @@ METHOD(task_manager_t, reset, void,
        this->initiating.seqnr = 0;
        this->initiating.retransmitted = 0;
        this->initiating.type = EXCHANGE_TYPE_UNDEFINED;
+       if (initiate != UINT_MAX)
+       {
+               this->dpd_send = initiate;
+       }
+       if (respond != UINT_MAX)
+       {
+               this->dpd_recv = respond;
+       }
 
        /* reset queued tasks */
        enumerator = this->queued_tasks->create_enumerator(this->queued_tasks);

diff --git a/src/libcharon/sa/task_manager.h b/src/libcharon/sa/task_manager.h
index b49c9a96b87c1b93a161ffc3ef6c0a668e35b303..cbebc0a21885a472aefad7e4b20bce7cffd0fcda 100644 (file)
--- a/src/libcharon/sa/task_manager.h
+++ b/src/libcharon/sa/task_manager.h
@@ -229,9 +229,11 @@ struct task_manager_t {
         * resets the message IDs and resets all active tasks using the migrate()
         * method.
         * Use a value of UINT_MAX to keep the current message ID.
+        * For IKEv1, the arguments do not set the message ID, but the DPD sequence
+        * number counters.
         *
-        * @param initiate              message ID to initiate exchanges (send)
-        * @param respond               message ID to respond to exchanges (expect)
+        * @param initiate              message ID / DPD seq to initiate exchanges (send)
+        * @param respond               message ID / DPD seq to respond to exchanges (expect)
         */
        void (*reset) (task_manager_t *this, u_int32_t initiate, u_int32_t respond);