denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

task-manager: Add retransmit count to retransmit send alert

Browse Source 
Signed-off-by: Thomas Egerer <[email protected]>
This commit is contained in:
Thomas Egerer
2016-06-06 14:11:01 +02:00
committed by Tobias Brunner
parent 2eb89ee1e3
commit 9da65eaeb9
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/bus/bus.h
+3 -2
View File
@@ -101,8 +101,9 @@ enum alert_t {
/** received IKE message with invalid body, argument is message_t*, /** received IKE message with invalid body, argument is message_t*,
* followed by a status_t result returned by message_t.parse_body(). */ * followed by a status_t result returned by message_t.parse_body(). */
ALERT_PARSE_ERROR_BODY, ALERT_PARSE_ERROR_BODY,
/** sending a retransmit for a message, argument is packet_t, if the message /** sending a retransmit for a message, arguments are packet_t and number
* got fragmented only the first fragment is passed */ * of the retransmit, if the message got fragmented only the first fragment
* is passed */
ALERT_RETRANSMIT_SEND, ALERT_RETRANSMIT_SEND,
/** sending retransmits timed out, argument is packet_t, if available and if /** sending retransmits timed out, argument is packet_t, if available and if
* the message got fragmented only the first fragment is passed */ * the message got fragmented only the first fragment is passed */
src/libcharon/sa/ikev1/task_manager_v1.c
+2 -1
View File
@@ -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", DBG1(DBG_IKE, "sending retransmit %u of %s message ID %u, seq %u",
retransmitted, seqnr < RESPONDING_SEQ ? "request" : "response", retransmitted, seqnr < RESPONDING_SEQ ? "request" : "response",
mid, seqnr < RESPONDING_SEQ ? seqnr : seqnr - RESPONDING_SEQ); 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); send_packets(this, packets);
lib->scheduler->schedule_job_ms(lib->scheduler, (job_t*) lib->scheduler->schedule_job_ms(lib->scheduler, (job_t*)
src/libcharon/sa/ikev2/task_manager_v2.c
+2 -1
View File
@@ -352,7 +352,8 @@ METHOD(task_manager_t, retransmit, status_t,
{ {
DBG1(DBG_IKE, "retransmit %d of request with message ID %d", DBG1(DBG_IKE, "retransmit %d of request with message ID %d",
this->initiating.retransmitted, message_id); 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) if (!mobike)
{ {