Merge branch 'stroke-timeout'

[strongswan.git] / src / libimcv / imc / imc_msg.h

diff --git a/src/libimcv/imc/imc_msg.h b/src/libimcv/imc/imc_msg.h
index 42cdd68..588225d 100644 (file)
--- a/src/libimcv/imc/imc_msg.h
+++ b/src/libimcv/imc/imc_msg.h
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup imc_msg imc_msg
 
 /**
  * @defgroup imc_msg imc_msg

- * @{ @ingroup libimcv
+ * @{ @ingroup libimcv_imc

  */
 
 #ifndef IMC_MSG_H_
  */
 
 #ifndef IMC_MSG_H_


@@ -48,6 +48,13 @@ struct imc_msg_t {
        TNC_UInt32 (*get_dst_id)(imc_msg_t *this);
 
        /**
        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
         *
         * @param excl                          set the excl message flag if supported
         * Sends one or multiple PA-TNC messages
         *
         * @param excl                          set the excl message flag if supported


@@ -69,7 +76,7 @@ struct imc_msg_t {
         * @param attr                          PA-TNC attribute to be added
         */
        void (*add_attribute)(imc_msg_t *this, pa_tnc_attr_t *attr);
         * @param attr                          PA-TNC attribute to be added
         */
        void (*add_attribute)(imc_msg_t *this, pa_tnc_attr_t *attr);

-       
+

        /**
         * Enumerator over PA-TNC attributes contained in the PA-TNC message
         *
        /**
         * Enumerator over PA-TNC attributes contained in the PA-TNC message
         *


@@ -78,6 +85,13 @@ struct imc_msg_t {
        enumerator_t* (*create_attribute_enumerator)(imc_msg_t *this);
 
        /**
        enumerator_t* (*create_attribute_enumerator)(imc_msg_t *this);
 
        /**

+        * Get the encoding of the IMC message.
+        *
+        * @return                                      message encoding, internal data
+        */
+       chunk_t (*get_encoding)(imc_msg_t *this);
+
+       /**

         * Destroys a imc_msg_t object.
         */
        void (*destroy)(imc_msg_t *this);
         * Destroys a imc_msg_t object.
         */
        void (*destroy)(imc_msg_t *this);


@@ -117,7 +131,7 @@ imc_msg_t* imc_msg_create_as_reply(imc_msg_t *msg);
 imc_msg_t* imc_msg_create_from_data(imc_agent_t *agent, imc_state_t *state,
                                                                        TNC_ConnectionID connection_id,
                                                                        TNC_MessageType msg_type,
 imc_msg_t* imc_msg_create_from_data(imc_agent_t *agent, imc_state_t *state,
                                                                        TNC_ConnectionID connection_id,
                                                                        TNC_MessageType msg_type,

-                                                                       chunk_t msg); 
+                                                                       chunk_t msg);

 
 /**
  * Create a wrapper around message data received via the long IF-IMC interface
 
 /**
  * Create a wrapper around message data received via the long IF-IMC interface


@@ -127,7 +141,6 @@ imc_msg_t* imc_msg_create_from_data(imc_agent_t *agent, imc_state_t *state,
  * @param connection_id                        connection ID
  * @param src_id                               source IMV ID
  * @param dst_id                               destination IMC ID
  * @param connection_id                        connection ID
  * @param src_id                               source IMV ID
  * @param dst_id                               destination IMC ID

- * @param msg_flags                            PA-TNC message flags

  * @param msg_vid                              PA-TNC message vendor ID
  * @param msg_subtype                  PA-TNC subtype
  * @param msg                                  received PA-TNC message blob
  * @param msg_vid                              PA-TNC message vendor ID
  * @param msg_subtype                  PA-TNC subtype
  * @param msg                                  received PA-TNC message blob


@@ -137,6 +150,6 @@ imc_msg_t* imc_msg_create_from_long_data(imc_agent_t *agent, imc_state_t *state,
                                                                                 TNC_UInt32 src_id, TNC_UInt32 dst_id,
                                                                                 TNC_VendorID msg_vid,
                                                                                 TNC_MessageSubtype msg_subtype,
                                                                                 TNC_UInt32 src_id, TNC_UInt32 dst_id,
                                                                                 TNC_VendorID msg_vid,
                                                                                 TNC_MessageSubtype msg_subtype,

-                                                                                chunk_t msg); 
+                                                                                chunk_t msg);

 
 #endif /** IMC_MSG_H_ @}*/
 
 #endif /** IMC_MSG_H_ @}*/