Reuse reqid when restarting CHILD_SAs for dpd|closeaction=restart

diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c
index 22b9e43480874fa356b3e2383db8e466ee71a03c..87552e9c31e2645fe1eef45b222906415a1a4b7f 100644 (file)
--- a/src/libcharon/sa/ike_sa.c
+++ b/src/libcharon/sa/ike_sa.c
@@ -1675,7 +1675,8 @@ METHOD(ike_sa_t, reestablish, status_t,
                                        DBG1(DBG_IKE, "restarting CHILD_SA %s",
                                                 child_cfg->get_name(child_cfg));
                                        child_cfg->get_ref(child_cfg);
-                                       status = new->initiate(new, child_cfg, 0, NULL, NULL);
+                                       status = new->initiate(new, child_cfg,
+                                                                       child_sa->get_reqid(child_sa), NULL, NULL);
                                        break;
                                default:
                                        continue;

diff --git a/src/libcharon/sa/ikev2/tasks/child_delete.c b/src/libcharon/sa/ikev2/tasks/child_delete.c
index 5e696775c76520ca74584f307db6325c427fb1cf..9f12d7385df671cbd04bd558c933d5474090f3a8 100644 (file)
--- a/src/libcharon/sa/ikev2/tasks/child_delete.c
+++ b/src/libcharon/sa/ikev2/tasks/child_delete.c
@@ -222,8 +222,8 @@ static status_t destroy_and_reestablish(private_child_delete_t *this)
                        {
                                case ACTION_RESTART:
                                        child_cfg->get_ref(child_cfg);
-                                       status = this->ike_sa->initiate(this->ike_sa, child_cfg, 0,
-                                                                                                       NULL, NULL);
+                                       status = this->ike_sa->initiate(this->ike_sa, child_cfg,
+                                                                       child_sa->get_reqid(child_sa), NULL, NULL);
                                        break;
                                case ACTION_ROUTE:
                                        charon->traps->install(charon->traps,