ike: Don't reset optional CHILD_SA properties when migrating child-creating tasks

These are set via methods, which are not called again after migration
(e.g. when retrying due to INVALID_KE or when moving queued tasks), so we
don't want to clear these values.

diff --git a/src/libcharon/sa/ikev1/tasks/quick_mode.c b/src/libcharon/sa/ikev1/tasks/quick_mode.c
index f75775357bdb1e4e9853514fee4cfbd6c45449ea..6138efc97268a9581c69a627f0a4fef7a1ba729d 100644 (file)
--- a/src/libcharon/sa/ikev1/tasks/quick_mode.c
+++ b/src/libcharon/sa/ikev1/tasks/quick_mode.c
@@ -1475,7 +1475,6 @@ METHOD(task_t, migrate, void,
        this->dh = NULL;
        this->spi_i = 0;
        this->spi_r = 0;
-       this->child = (child_sa_create_t){};
 
        if (!this->initiator)
        {

diff --git a/src/libcharon/sa/ikev2/tasks/child_create.c b/src/libcharon/sa/ikev2/tasks/child_create.c
index 64dd55167bf4873a6fc1327f5cf14d2970805c64..5a6c1b4319ae389b418047de89bbe4581df9be3c 100644 (file)
--- a/src/libcharon/sa/ikev2/tasks/child_create.c
+++ b/src/libcharon/sa/ikev2/tasks/child_create.c
@@ -1876,7 +1876,6 @@ METHOD(task_t, migrate, void,
        this->ipcomp_received = IPCOMP_NONE;
        this->other_cpi = 0;
        this->established = FALSE;
-       this->child = (child_sa_create_t){};
 }
 
 METHOD(task_t, destroy, void,