ikev1: Reestablish IKE_SA/CHILD_SAs if it gets deleted by the peer

We call ike_sa_t.reestablish() so the IKE_SA is only recreated if any
CHILD_SA requires it.

diff --git a/src/libcharon/sa/ikev1/tasks/isakmp_delete.c b/src/libcharon/sa/ikev1/tasks/isakmp_delete.c
index 0640d13b17cd07ba24f390c1babcbb0a0bc2d40d..a44f3c4a9c95a60f69c77c9374c6e929ee5c7092 100644 (file)
--- a/src/libcharon/sa/ikev1/tasks/isakmp_delete.c
+++ b/src/libcharon/sa/ikev1/tasks/isakmp_delete.c
@@ -85,6 +85,11 @@ METHOD(task_t, process_r, status_t,
                 this->ike_sa->get_other_host(this->ike_sa),
                 this->ike_sa->get_other_id(this->ike_sa));
 
+       if (this->ike_sa->get_state(this->ike_sa) == IKE_ESTABLISHED)
+       {
+               this->ike_sa->set_state(this->ike_sa, IKE_DELETING);
+               this->ike_sa->reestablish(this->ike_sa);
+       }
        this->ike_sa->set_state(this->ike_sa, IKE_DELETING);
        charon->bus->ike_updown(charon->bus, this->ike_sa, FALSE);
        return DESTROY_ME;