Reuse reqid of an existing Quick Mode, even if it has been rekeyed

If two peers rekey Quick Modes at the same time, the original Quick Mode is
in REKEYING state and hence the requid is not reused. This is required though,
as two identical policies won't work if they have different requids.

diff --git a/src/libcharon/sa/ikev1/tasks/quick_mode.c b/src/libcharon/sa/ikev1/tasks/quick_mode.c
index afdff8cf9df2ab25d8c21e12799ea4470866514f..bb50ca9caa518841fb65c90cf98b6b508f765bb6 100644 (file)
--- a/src/libcharon/sa/ikev1/tasks/quick_mode.c
+++ b/src/libcharon/sa/ikev1/tasks/quick_mode.c
@@ -925,7 +925,8 @@ static void check_for_rekeyed_child(private_quick_mode_t *this)
        enumerator = this->ike_sa->create_child_sa_enumerator(this->ike_sa);
        while (this->reqid == 0 && enumerator->enumerate(enumerator, &child_sa))
        {
-               if (child_sa->get_state(child_sa) == CHILD_INSTALLED &&
+               if ((child_sa->get_state(child_sa) == CHILD_INSTALLED ||
+                        child_sa->get_state(child_sa) == CHILD_REKEYING) &&
                        streq(child_sa->get_name(child_sa),
                                  this->config->get_name(this->config)))
                {