From: Tobias Brunner Date: Thu, 20 May 2021 09:43:39 +0000 (+0200) Subject: ike: Don't reset optional CHILD_SA properties when migrating child-creating tasks X-Git-Tag: 5.9.6rc1~3^2~46 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=366ac36a1f46607d7fee9c34fffa334799cd415f;p=thirdparty%2Fstrongswan.git 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 f75775357b..6138efc972 100644 --- 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 64dd55167b..5a6c1b4319 100644 --- 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,