task-manager: Add retransmit cleared alert

diff --git a/src/libcharon/bus/bus.h b/src/libcharon/bus/bus.h
index 182ced7ab96a2ae536bb912c4be8ea032fd66be1..305cbe4ae607ae37d42e731944c77ab7bc31913f 100644 (file)
--- a/src/libcharon/bus/bus.h
+++ b/src/libcharon/bus/bus.h
@@ -105,6 +105,9 @@ enum alert_t {
         * of the retransmit, if the message got fragmented only the first fragment
         * is passed */
        ALERT_RETRANSMIT_SEND,
+       /** received response for retransmitted request, argument is packet_t, if
+        * the message got fragmented only the first fragment is passed */
+       ALERT_RETRANSMIT_SEND_CLEARED,
        /** sending retransmits timed out, argument is packet_t, if available and if
         *  the message got fragmented only the first fragment is passed */
        ALERT_RETRANSMIT_SEND_TIMEOUT,

diff --git a/src/libcharon/sa/ikev1/task_manager_v1.c b/src/libcharon/sa/ikev1/task_manager_v1.c
index ea1177d57c8363f2ac554814071143ce88383f42..126863a66bb33ce954f1eaa9b508738620f9a549 100644 (file)
--- a/src/libcharon/sa/ikev1/task_manager_v1.c
+++ b/src/libcharon/sa/ikev1/task_manager_v1.c
@@ -1181,6 +1181,12 @@ static status_t process_response(private_task_manager_t *this,
        }
        enumerator->destroy(enumerator);
 
+       if (this->initiating.retransmitted)
+       {
+               packet_t *packet = NULL;
+               array_get(this->initiating.packets, 0, &packet);
+               charon->bus->alert(charon->bus, ALERT_RETRANSMIT_SEND_CLEARED, packet);
+       }
        this->initiating.type = EXCHANGE_TYPE_UNDEFINED;
        clear_packets(this->initiating.packets);
 

diff --git a/src/libcharon/sa/ikev2/task_manager_v2.c b/src/libcharon/sa/ikev2/task_manager_v2.c
index abbffb29df7d30e9c802fdc7fb94db4ba8298b24..702c383b1c4d71e40e5bdd34b3eb3f6365c46bbb 100644 (file)
--- a/src/libcharon/sa/ikev2/task_manager_v2.c
+++ b/src/libcharon/sa/ikev2/task_manager_v2.c
@@ -695,6 +695,13 @@ static status_t process_response(private_task_manager_t *this,
        }
        enumerator->destroy(enumerator);
 
+       if (this->initiating.retransmitted)
+       {
+               packet_t *packet = NULL;
+               array_get(this->initiating.packets, 0, &packet);
+               charon->bus->alert(charon->bus, ALERT_RETRANSMIT_SEND_CLEARED, packet);
+       }
+
        /* catch if we get resetted while processing */
        this->reset = FALSE;
        enumerator = array_create_enumerator(this->active_tasks);