cleaned up and fixed DPD handling code
[strongswan.git] / src / charon / sa / task_manager.c
index 050f651..be35cea 100644 (file)
@@ -485,10 +485,10 @@ static status_t process_request(private_task_manager_t *this,
                        this->passive_tasks->insert_last(this->passive_tasks, task);
                        task = (task_t*)ike_cert_create(this->ike_sa, FALSE);
                        this->passive_tasks->insert_last(this->passive_tasks, task);
-                       task = (task_t*)ike_config_create(this->ike_sa, NULL);
-                       this->passive_tasks->insert_last(this->passive_tasks, task);
                        task = (task_t*)ike_auth_create(this->ike_sa, FALSE);
                        this->passive_tasks->insert_last(this->passive_tasks, task);
+                       task = (task_t*)ike_config_create(this->ike_sa, NULL);
+                       this->passive_tasks->insert_last(this->passive_tasks, task);
                        task = (task_t*)child_create_create(this->ike_sa, NULL);
                        this->passive_tasks->insert_last(this->passive_tasks, task);
                        break;
@@ -739,7 +739,7 @@ static void destroy(private_task_manager_t *this)
                                SIG(IKE_UP_FAILED, "establishing IKE_SA failed");
                                break;
                        case IKE_DELETE:
-                               SIG(IKE_DOWN_FAILED, "deleting IKE_SA properly failed");
+                               SIG(IKE_DOWN_FAILED, "IKE_SA deleted");
                                break;
                        case IKE_REKEY:
                                SIG(IKE_REKEY_FAILED, "rekeying IKE_SA failed");