ikev2: Check for collisions after handling IKE deletion

diff --git a/src/libcharon/sa/ikev2/task_manager_v2.c b/src/libcharon/sa/ikev2/task_manager_v2.c
index 26e5b48a8e457fbbe1736dda04b2e94a91309ea8..5f7d81b59b0e5138c8ef6514f567111b260b0b57 100644 (file)
--- a/src/libcharon/sa/ikev2/task_manager_v2.c
+++ b/src/libcharon/sa/ikev2/task_manager_v2.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2015 Tobias Brunner
+ * Copyright (C) 2007-2016 Tobias Brunner
  * Copyright (C) 2007-2010 Martin Willi
  * Hochschule fuer Technik Rapperswil
  *
@@ -849,6 +849,10 @@ static status_t build_response(private_task_manager_t *this, message_t *request)
                                /* FALL */
                        case DESTROY_ME:
                                /* destroy IKE_SA, but SEND response first */
+                               if (handle_collisions(this, task))
+                               {
+                                       array_remove_at(this->passive_tasks, enumerator);
+                               }
                                delete = TRUE;
                                break;
                }