child-delete: Correctly maintain allocated reqid when recreating CHILD_SA

The old CHILD_SA is destroyed even before the new task is queued, this
makes sure we always maintain a reference to the reqid.

diff --git a/src/libcharon/sa/ikev2/tasks/child_delete.c b/src/libcharon/sa/ikev2/tasks/child_delete.c
index 54aba2c5068a8e982f8c77f4c6718ee9a91f70eb..2e2668bbe20b46e2390b80fad9d6c92609ec0173 100644 (file)
--- a/src/libcharon/sa/ikev2/tasks/child_delete.c
+++ b/src/libcharon/sa/ikev2/tasks/child_delete.c
@@ -366,7 +366,7 @@ static status_t destroy_and_reestablish(private_child_delete_t *this)
                spi = child_sa->get_spi(child_sa, TRUE);
                child_cfg = child_sa->get_config(child_sa);
                child_cfg->get_ref(child_cfg);
-               args.reqid = child_sa->get_reqid(child_sa);
+               args.reqid = child_sa->get_reqid_ref(child_sa);
                args.label = child_sa->get_label(child_sa);
                if (args.label)
                {
@@ -391,6 +391,10 @@ static status_t destroy_and_reestablish(private_child_delete_t *this)
                        }
                }
                child_cfg->destroy(child_cfg);
+               if (args.reqid)
+               {
+                       charon->kernel->release_reqid(charon->kernel, args.reqid);
+               }
                DESTROY_IF(args.label);
                if (status != SUCCESS)
                {