From: Martin Willi <martin@revosec.ch>
Date: Fri, 19 Oct 2012 09:32:20 +0000 (+0200)
Subject: Add alerts for sent/received message retransmissions and timeout
X-Git-Tag: 5.0.2dr4~151
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3c79b7b7db0e36d593d8a425ec865e6b153157de;p=thirdparty%2Fstrongswan.git

Add alerts for sent/received message retransmissions and timeout
---

diff --git a/src/libcharon/bus/bus.h b/src/libcharon/bus/bus.h
index 8a6382f880..cc378b4963 100644
--- a/src/libcharon/bus/bus.h
+++ b/src/libcharon/bus/bus.h
@@ -99,6 +99,12 @@ 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 */
+	ALERT_RETRANSMIT_SEND,
+	/** sending retransmits timed out, argument is packet_t */
+	ALERT_RETRANSMIT_SEND_TIMEOUT,
+	/** received a retransmit for a message, argument is message_t */
+	ALERT_RETRANSMIT_RECEIVE,
 };
 
 /**
diff --git a/src/libcharon/sa/ikev1/task_manager_v1.c b/src/libcharon/sa/ikev1/task_manager_v1.c
index 2ea6361645..1ee833ccea 100644
--- a/src/libcharon/sa/ikev1/task_manager_v1.c
+++ b/src/libcharon/sa/ikev1/task_manager_v1.c
@@ -293,6 +293,7 @@ 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);
+		charon->bus->alert(charon->bus, ALERT_RETRANSMIT_SEND_TIMEOUT, packet);
 		return DESTROY_ME;
 	}
 	t = (u_int32_t)(this->retransmit_timeout * 1000.0 *
@@ -302,6 +303,7 @@ static status_t retransmit_packet(private_task_manager_t *this, u_int32_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->sender->send(charon->sender, packet->clone(packet));
 	lib->scheduler->schedule_job_ms(lib->scheduler, (job_t*)
@@ -1167,6 +1169,7 @@ METHOD(task_manager_t, process_message, status_t,
 				DBG1(DBG_IKE, "received retransmit of request with ID %u, "
 					 "but no response to retransmit", mid);
 			}
+			charon->bus->alert(charon->bus, ALERT_RETRANSMIT_RECEIVE, msg);
 			return SUCCESS;
 		}
 		if (msg->get_exchange_type(msg) == TRANSACTION &&
diff --git a/src/libcharon/sa/ikev2/task_manager_v2.c b/src/libcharon/sa/ikev2/task_manager_v2.c
index 524540445e..5cb1490ebb 100644
--- a/src/libcharon/sa/ikev2/task_manager_v2.c
+++ b/src/libcharon/sa/ikev2/task_manager_v2.c
@@ -257,6 +257,8 @@ METHOD(task_manager_t, retransmit, status_t,
 			{
 				DBG1(DBG_IKE, "giving up after %d retransmits",
 					 this->initiating.retransmitted - 1);
+				charon->bus->alert(charon->bus, ALERT_RETRANSMIT_SEND_TIMEOUT,
+								   this->initiating.packet);
 				return DESTROY_ME;
 			}
 
@@ -264,6 +266,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,
+								   this->initiating.packet);
 			}
 			packet = this->initiating.packet->clone(this->initiating.packet);
 			charon->sender->send(charon->sender, packet);
@@ -1136,6 +1140,7 @@ METHOD(task_manager_t, process_message, status_t,
 
 			DBG1(DBG_IKE, "received retransmit of request with ID %d, "
 				 "retransmitting response", mid);
+			charon->bus->alert(charon->bus, ALERT_RETRANSMIT_RECEIVE, msg);
 			clone = this->responding.packet->clone(this->responding.packet);
 			host = msg->get_destination(msg);
 			clone->set_source(clone, host->clone(host));