Raise a bus alert when IKE message body parsing fails

diff --git a/src/libcharon/bus/bus.h b/src/libcharon/bus/bus.h
index 2cd04cf97a32abde9e4a3a44220a6c5b7373fe0a..485b1dc6acadbed79ad57e338b6d2d311de36f62 100644 (file)
--- a/src/libcharon/bus/bus.h
+++ b/src/libcharon/bus/bus.h
@@ -96,6 +96,9 @@ enum alert_t {
        ALERT_INVALID_IKE_SPI,
        /** received IKE message with invalid header, argument is message_t* */
        ALERT_PARSE_ERROR_HEADER,
+       /** 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,
 };
 
 /**

diff --git a/src/libcharon/sa/ikev1/task_manager_v1.c b/src/libcharon/sa/ikev1/task_manager_v1.c
index 5b7258fad02bca7c6e5af98d39e8822faf7213aa..2ea636164538928ec0e7e7d8b4e954df14b9ba4f 100644 (file)
--- a/src/libcharon/sa/ikev1/task_manager_v1.c
+++ b/src/libcharon/sa/ikev1/task_manager_v1.c
@@ -1076,6 +1076,8 @@ static status_t parse_message(private_task_manager_t *this, message_t *msg)
                         msg->get_request(msg) ? "request" : "response",
                         msg->get_message_id(msg));
 
+               charon->bus->alert(charon->bus, ALERT_PARSE_ERROR_BODY, msg, status);
+
                if (this->ike_sa->get_state(this->ike_sa) == IKE_CREATED)
                {       /* invalid initiation attempt, close SA */
                        return DESTROY_ME;

diff --git a/src/libcharon/sa/ikev2/task_manager_v2.c b/src/libcharon/sa/ikev2/task_manager_v2.c
index 5890ba5eb26f4d1b0f0b07d21523ae9ab76989b8..524540445e4750e9d25d0f7342095dcea2ca4835 100644 (file)
--- a/src/libcharon/sa/ikev2/task_manager_v2.c
+++ b/src/libcharon/sa/ikev2/task_manager_v2.c
@@ -1045,6 +1045,8 @@ static status_t parse_message(private_task_manager_t *this, message_t *msg)
                         is_request ? "request" : "response",
                         msg->get_message_id(msg));
 
+               charon->bus->alert(charon->bus, ALERT_PARSE_ERROR_BODY, msg, status);
+
                if (this->ike_sa->get_state(this->ike_sa) == IKE_CREATED)
                {       /* invalid initiation attempt, close SA */
                        return DESTROY_ME;