child-rekey: Remove redundant migrate() call for child-create sub-task
authorTobias Brunner <tobias@strongswan.org>
Tue, 28 Jul 2015 13:28:33 +0000 (15:28 +0200)
committerTobias Brunner <tobias@strongswan.org>
Fri, 21 Aug 2015 14:14:07 +0000 (16:14 +0200)
When retrying due to a DH group mismatch this is already done by the
child-create task itself.  And in other cases where the task returns
NEED_MORE we actually will need access to a possible proposal to properly
delete it.

src/libcharon/sa/ikev2/tasks/child_rekey.c

index c806e19..4dc9aaf 100644 (file)
@@ -334,8 +334,7 @@ METHOD(task_t, process_i, status_t,
        if (this->child_create->task.process(&this->child_create->task,
                                                                                 message) == NEED_MORE)
        {
-               /* bad DH group while rekeying, try again */
-               this->child_create->task.migrate(&this->child_create->task, this->ike_sa);
+               /* bad DH group while rekeying, retry, or failure requiring deletion */
                return NEED_MORE;
        }
        if (message->get_payload(message, PLV2_SECURITY_ASSOCIATION) == NULL)