1 files changed, 87 insertions, 36 deletions
diff --git a/Source/charon/payloads/ike_header.h b/Source/charon/payloads/ike_header.h
index 2674b6556..fc8a597dc 100644
--- a/Source/charon/payloads/ike_header.h
+++ b/Source/charon/payloads/ike_header.h
@@ -96,59 +96,110 @@ struct ike_header_s {
 	 * implements payload_t interface
 	 */
 	payload_t payload_interface;
+	
 	/**
-	 * SPI of the initiator
+	 * @brief get the initiator spi
+	 *
+	 * @param this 			ike_header_t object
+	 * @return 				initiator_spi
 	 */
-	u_int64_t initiator_spi;
+	u_int64_t (*get_initiator_spi) (ike_header_t *this);
+	
 	/**
-	 * SPI of the responder
+	 * @brief set the initiator spi
+	 *
+	 * @param this 			ike_header_t object
+	 * @param initiator_spi	initiator_spi
 	 */
-	u_int64_t responder_spi;
+	void (*set_initiator_spi) (ike_header_t *this, u_int64_t initiator_spi);
+	
 	/**
-	 * next payload type
+	 * @brief get the responder spi
+	 *
+	 * @param this 			ike_header_t object
+	 * @return 				responder_spi
 	 */
-	u_int8_t  next_payload;
+	u_int64_t (*get_responder_spi) (ike_header_t *this);
+	
 	/**
-	 * IKE major version
+	 * @brief set the responder spi
+	 *
+	 * @param this 			ike_header_t object
+	 * @param responder_spi	responder_spi
 	 */
-	u_int8_t  maj_version;
-
+	void (*set_responder_spi) (ike_header_t *this, u_int64_t responder_spi);
+	
 	/**
-	 * IKE minor version
-	 */	
-	u_int8_t  min_version;
-
+	 * @brief get the major version
+	 *
+	 * @param this 			ike_header_t object
+	 * @return 				major version
+	 */
+	u_int8_t (*get_maj_version) (ike_header_t *this);
+	
 	/**
-	 * Exchange type 
-	 */	
-	u_int8_t  exchange_type;
+	 * @brief get the mainor version
+	 *
+	 * @param this 			ike_header_t object
+	 * @return 				minor version
+	 */
+	u_int8_t (*get_min_version) (ike_header_t *this);
 	
 	/**
-	 * Flags of the Message
-	 * 
+	 * @brief get the response flag
+	 *
+	 * @param this 			ike_header_t object
+	 * @return 				response flag
 	 */
-	struct { 
-		/**
-		 * Sender is initiator of the associated IKE_SA_INIT-Exchange
-		 */
-		bool initiator;
-		/**
-		 * is protocol supporting higher version?
-		 */
-		bool version;
-		/**
-		 * TRUE, if this is a response, FALSE if its a Request
-		 */
-		bool response;
-	} flags;
+	bool (*get_response_flag) (ike_header_t *this);
+	
 	/**
-	 * Associated Message-ID
+	 * @brief get "higher version supported"-flag
+	 *
+	 * @param this 			ike_header_t object
+	 * @return 				version flag
 	 */
-	u_int32_t message_id;
+	bool (*get_version_flag) (ike_header_t *this);
+	
+	/**
+	 * @brief get the initiator flag
+	 *
+	 * @param this 			ike_header_t object
+	 * @return 				initiator flag
+	 */
+	bool (*get_initiator_flag) (ike_header_t *this);
+	
+	/**
+	 * @brief get the exchange type
+	 *
+	 * @param this 			ike_header_t object
+	 * @return 				 exchange type
+	 */
+	u_int8_t (*get_exchange_type) (ike_header_t *this);
+	
 	/**
-	 * Length of the whole IKEv2-Message (header and all payloads)
+	 * @brief set the  exchange type
+	 *
+	 * @param this 			ike_header_t object
+	 * @param exchange_type	exchange type
+	 */
+	void (*set_exchange_type) (ike_header_t *this, u_int8_t exchange_type);
+	
+	/**
+	 * @brief get the message id
+	 *
+	 * @param this 			ike_header_t object
+	 * @return 				message id
+	 */
+	u_int32_t (*get_message_id) (ike_header_t *this);
+	
+	/**
+	 * @brief set the message id
+	 *
+	 * @param this 			ike_header_t object
+	 * @param initiator_spi	message id
 	 */
-	u_int32_t length;
+	void (*set_message_id) (ike_header_t *this, u_int32_t message_id);
 	
 	/**
 	 * @brief Destroys a ike_header_t object.