Add IF-M message subtype getter to IMC/IMV messages

diff --git a/src/libimcv/imc/imc_msg.c b/src/libimcv/imc/imc_msg.c
index 050e63f3252417f47a55c221d38527d618687c79..1fc3d3be526afc1988e01674deb7bc7f23e60acf 100644 (file)
--- a/src/libimcv/imc/imc_msg.c
+++ b/src/libimcv/imc/imc_msg.c
@@ -91,6 +91,12 @@ METHOD(imc_msg_t, get_dst_id, TNC_UInt32,
        return this->dst_id;
 }
 
+METHOD(imc_msg_t, get_msg_type, pen_type_t,
+       private_imc_msg_t *this)
+{
+       return this->msg_type;
+}
+
 METHOD(imc_msg_t, send_, TNC_Result,
        private_imc_msg_t *this, bool excl)
 {
@@ -380,6 +386,7 @@ imc_msg_t *imc_msg_create(imc_agent_t *agent, imc_state_t *state,
                .public = {
                        .get_src_id = _get_src_id,
                        .get_dst_id = _get_dst_id,
+                       .get_msg_type = _get_msg_type,
                        .send = _send_,
                        .receive = _receive,
                        .add_attribute = _add_attribute,
@@ -454,4 +461,3 @@ imc_msg_t *imc_msg_create_from_long_data(imc_agent_t *agent, imc_state_t *state,
 
        return &this->public;
 }
-

diff --git a/src/libimcv/imc/imc_msg.h b/src/libimcv/imc/imc_msg.h
index 6dd712e84a58aef7b14fd4db0dd8a7360a995011..9a4623ae9066d6bf515c0eba4af179c6079e65c4 100644 (file)
--- a/src/libimcv/imc/imc_msg.h
+++ b/src/libimcv/imc/imc_msg.h
@@ -47,6 +47,13 @@ struct imc_msg_t {
         */
        TNC_UInt32 (*get_dst_id)(imc_msg_t *this);
 
+       /**
+        * Get the PA-TNC message type.
+        *
+        * @return                                      message type
+        */
+       pen_type_t (*get_msg_type)(imc_msg_t *this);
+
        /**
         * Sends one or multiple PA-TNC messages
         *

diff --git a/src/libimcv/imv/imv_msg.c b/src/libimcv/imv/imv_msg.c
index 4ed19dd13fde12698dfe3ae11f445374d8e1994a..496d0ee1c6f1741c9cf5c5f30baf5291cd931bc7 100644 (file)
--- a/src/libimcv/imv/imv_msg.c
+++ b/src/libimcv/imv/imv_msg.c
@@ -102,6 +102,12 @@ METHOD(imv_msg_t, set_msg_type, void,
        }
 }
 
+METHOD(imv_msg_t, get_msg_type, pen_type_t,
+       private_imv_msg_t *this)
+{
+       return this->msg_type;
+}
+
 METHOD(imv_msg_t, add_attribute, void,
        private_imv_msg_t *this, pa_tnc_attr_t *attr)
 {
@@ -352,6 +358,7 @@ imv_msg_t *imv_msg_create(imv_agent_t *agent, imv_state_t *state,
                        .get_src_id = _get_src_id,
                        .get_dst_id = _get_dst_id,
                        .set_msg_type = _set_msg_type,
+                       .get_msg_type = _get_msg_type,
                        .send = _send_,
                        .send_assessment = _send_assessment,
                        .receive = _receive,

diff --git a/src/libimcv/imv/imv_msg.h b/src/libimcv/imv/imv_msg.h
index b639712e88779e9c411e7e6fc78a0dd86f0c3635..2a2810170ebb2e4d90087d09dbcdc63bd84c352b 100644 (file)
--- a/src/libimcv/imv/imv_msg.h
+++ b/src/libimcv/imv/imv_msg.h
@@ -54,6 +54,13 @@ struct imv_msg_t {
         */
        void (*set_msg_type)(imv_msg_t *this, pen_type_t msg_type);
 
+       /**
+        * Get the type of a PA-TNC message.
+        *
+        * @return                                      message type
+        */
+       pen_type_t (*get_msg_type)(imv_msg_t *this);
+
        /**
         * Sends one or multiple PA-TNC messages
         *