Trigger ike_updown event caused by retransmits only after reestablish() has been...

This allows listeners to migrate to the new IKE_SA with the
ike_reestablish event without having to worry about an ike_updown event
for the old IKE_SA.

diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c
index e141380d2b7eb74f9964f5b9a52f50e45326ffd6..635528c4dcc3c662ac811f565a9af195d37878f9 100644 (file)
--- a/src/libcharon/sa/ike_sa.c
+++ b/src/libcharon/sa/ike_sa.c
@@ -1713,6 +1713,10 @@ METHOD(ike_sa_t, retransmit, status_t,
                                reestablish(this);
                                break;
                }
+               if (this->state != IKE_CONNECTING)
+               {
+                       charon->bus->ike_updown(charon->bus, &this->public, FALSE);
+               }
                return DESTROY_ME;
        }
        return SUCCESS;

diff --git a/src/libcharon/sa/ikev1/task_manager_v1.c b/src/libcharon/sa/ikev1/task_manager_v1.c
index ea836b76eadab9ba6eb9c4aeddd956584212b0a2..1ca8a0cf1607b1f9effdfaccacf047c891e83fbd 100644 (file)
--- a/src/libcharon/sa/ikev1/task_manager_v1.c
+++ b/src/libcharon/sa/ikev1/task_manager_v1.c
@@ -293,10 +293,6 @@ static status_t retransmit_packet(private_task_manager_t *this, u_int32_t seqnr,
        if (retransmitted > this->retransmit_tries)
        {
                DBG1(DBG_IKE, "giving up after %u retransmits", retransmitted - 1);
-               if (this->ike_sa->get_state(this->ike_sa) != IKE_CONNECTING)
-               {
-                       charon->bus->ike_updown(charon->bus, this->ike_sa, FALSE);
-               }
                return DESTROY_ME;
        }
        t = (u_int32_t)(this->retransmit_timeout * 1000.0 *
@@ -599,7 +595,7 @@ METHOD(task_manager_t, initiate, status_t,
        }
 
        this->initiating.seqnr++;
-       if (expect_response )
+       if (expect_response)
        {
                message->destroy(message);
                return retransmit(this, this->initiating.seqnr);

diff --git a/src/libcharon/sa/ikev2/task_manager_v2.c b/src/libcharon/sa/ikev2/task_manager_v2.c
index 81367d21c8156b33c53124756644e503dde21d02..83e08b377714ac4ea3f6b69f126e244f0cb1e9cc 100644 (file)
--- a/src/libcharon/sa/ikev2/task_manager_v2.c
+++ b/src/libcharon/sa/ikev2/task_manager_v2.c
@@ -257,10 +257,6 @@ METHOD(task_manager_t, retransmit, status_t,
                        {
                                DBG1(DBG_IKE, "giving up after %d retransmits",
                                         this->initiating.retransmitted - 1);
-                               if (this->ike_sa->get_state(this->ike_sa) != IKE_CONNECTING)
-                               {
-                                       charon->bus->ike_updown(charon->bus, this->ike_sa, FALSE);
-                               }
                                return DESTROY_ME;
                        }
 
@@ -282,7 +278,6 @@ METHOD(task_manager_t, retransmit, status_t,
                        {
                                DBG1(DBG_IKE, "giving up after %d path probings",
                                         this->initiating.retransmitted - 1);
-                               charon->bus->ike_updown(charon->bus, this->ike_sa, FALSE);
                                return DESTROY_ME;
                        }