child-delete: Reply as usual when concurrently rekeying the IKE_SA
authorTobias Brunner <tobias@strongswan.org>
Tue, 31 May 2016 08:08:03 +0000 (10:08 +0200)
committerTobias Brunner <tobias@strongswan.org>
Fri, 17 Jun 2016 16:48:06 +0000 (18:48 +0200)
As per RFC 7296, 2.25.2 (what we did before was the behavior described
in RFC 4718).

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

index b79ccf3..6fa8836 100644 (file)
@@ -382,11 +382,7 @@ METHOD(task_t, process_r, status_t,
 METHOD(task_t, build_r, status_t,
        private_child_delete_t *this, message_t *message)
 {
-       /* if we are rekeying, we send an empty informational */
-       if (this->ike_sa->get_state(this->ike_sa) != IKE_REKEYING)
-       {
-               build_payloads(this, message);
-       }
+       build_payloads(this, message);
        DBG1(DBG_IKE, "CHILD_SA closed");
        return destroy_and_reestablish(this);
 }