Recreate IKE_INIT/IKE_NATD/IKE_VENDOR tasks if we reset SA during IKE_AUTH

diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c
index a2190ff0ca85614a59a164d273336fe8fa48c62f..ed49170adc68c1f3216b73f183cde063ba5afa9b 100644 (file)
--- a/src/libcharon/sa/ike_sa.c
+++ b/src/libcharon/sa/ike_sa.c
@@ -1628,6 +1628,17 @@ METHOD(ike_sa_t, retransmit, status_t,
                                        DBG1(DBG_IKE, "peer not responding, trying again (%d/%d)",
                                                 this->keyingtry + 1, tries);
                                        reset(this);
+                                       if (this->stats[STAT_INBOUND])
+                                       {       /* IKE_INIT already completed, recreate associated tasks */
+                                               task_t *task;
+
+                                               task = (task_t*)ike_vendor_create(&this->public, TRUE);
+                                               this->task_manager->queue_task(this->task_manager, task);
+                                               task = (task_t*)ike_natd_create(&this->public, TRUE);
+                                               this->task_manager->queue_task(this->task_manager, task);
+                                               task = (task_t*)ike_init_create(&this->public, TRUE, NULL);
+                                               this->task_manager->queue_task(this->task_manager, task);
+                                       }
                                        return this->task_manager->initiate(this->task_manager);
                                }
                                DBG1(DBG_IKE, "establishing IKE_SA failed, peer not responding");