task-manager: Add retransmit count to retransmit send alert

Signed-off-by: Thomas Egerer <thomas.egerer@secunet.com>

diff --git a/src/libcharon/bus/bus.h b/src/libcharon/bus/bus.h
index 8746cb89d1a09190fbc552a67b91b2e5f0b9f749..182ced7ab96a2ae536bb912c4be8ea032fd66be1 100644 (file)
--- a/src/libcharon/bus/bus.h
+++ b/src/libcharon/bus/bus.h
@@ -101,8 +101,9 @@ enum alert_t {
        /** received IKE message with invalid body, argument is message_t*,
         *  followed by a status_t result returned by message_t.parse_body(). */
        ALERT_PARSE_ERROR_BODY,
-       /** sending a retransmit for a message, argument is packet_t, if the message
-        *  got fragmented only the first fragment is passed */
+       /** sending a retransmit for a message, arguments are packet_t and number
+        * of the retransmit, if the message got fragmented only the first fragment
+        * is passed */
        ALERT_RETRANSMIT_SEND,
        /** sending retransmits timed out, argument is packet_t, if available and if
         *  the message got fragmented only the first fragment is passed */

diff --git a/src/libcharon/sa/ikev1/task_manager_v1.c b/src/libcharon/sa/ikev1/task_manager_v1.c
index 273936c46346284ffaa6891a3e58b1e8c96464bb..ea1177d57c8363f2ac554814071143ce88383f42 100644 (file)
--- a/src/libcharon/sa/ikev1/task_manager_v1.c
+++ b/src/libcharon/sa/ikev1/task_manager_v1.c
@@ -361,7 +361,8 @@ static status_t retransmit_packet(private_task_manager_t *this, uint32_t seqnr,
                DBG1(DBG_IKE, "sending retransmit %u of %s message ID %u, seq %u",
                         retransmitted, seqnr < RESPONDING_SEQ ? "request" : "response",
                         mid, seqnr < RESPONDING_SEQ ? seqnr : seqnr - RESPONDING_SEQ);
-               charon->bus->alert(charon->bus, ALERT_RETRANSMIT_SEND, packet);
+               charon->bus->alert(charon->bus, ALERT_RETRANSMIT_SEND, packet,
+                                                  retransmitted);
        }
        send_packets(this, packets);
        lib->scheduler->schedule_job_ms(lib->scheduler, (job_t*)

diff --git a/src/libcharon/sa/ikev2/task_manager_v2.c b/src/libcharon/sa/ikev2/task_manager_v2.c
index a7989c50757c39fa309323d086a167aabfacb2f7..abbffb29df7d30e9c802fdc7fb94db4ba8298b24 100644 (file)
--- a/src/libcharon/sa/ikev2/task_manager_v2.c
+++ b/src/libcharon/sa/ikev2/task_manager_v2.c
@@ -352,7 +352,8 @@ METHOD(task_manager_t, retransmit, status_t,
                        {
                                DBG1(DBG_IKE, "retransmit %d of request with message ID %d",
                                         this->initiating.retransmitted, message_id);
-                               charon->bus->alert(charon->bus, ALERT_RETRANSMIT_SEND, packet);
+                               charon->bus->alert(charon->bus, ALERT_RETRANSMIT_SEND, packet,
+                                                                  this->initiating.retransmitted);
                        }
                        if (!mobike)
                        {