- changed include paths

Source/charon/states/ike_auth_requested.c

@@ -22,7 +22,7 @@
  
 #include "ike_auth_requested.h"
 
-#include "../utils/allocator.h"
+#include <utils/allocator.h>
 
 /**
  * Private data of a ike_auth_requested_t object.

Source/charon/states/ike_auth_requested.h

@@ -23,8 +23,8 @@
 #ifndef IKE_AUTH_REQUESTED_H_
 #define IKE_AUTH_REQUESTED_H_
 
-#include "state.h"
-#include "../ike_sa.h"
+#include <states/state.h>
+#include <ike_sa.h>
 
 /**
  * @brief This class represents an IKE_SA, which has requested an IKE_AUTH.

Source/charon/states/ike_sa_established.c

@@ -22,7 +22,7 @@
  
 #include "ike_sa_established.h"
 
-#include "../utils/allocator.h"
+#include <utils/allocator.h>
 
 /**
  * Private data of a ike_sa_established_t object.

Source/charon/states/ike_sa_established.h

@@ -23,8 +23,8 @@
 #ifndef IKE_SA_ESTABLISHED_H_
 #define IKE_SA_ESTABLISHED_H_
 
-#include "state.h"
-#include "../ike_sa.h"
+#include <states/state.h>
+#include <ike_sa.h>
 
 /**
  * @brief This class represents an the state of an established

Source/charon/states/ike_sa_init_requested.c

@@ -22,12 +22,12 @@
  
 #include "ike_sa_init_requested.h"
 
-#include "../globals.h"
-#include "../utils/allocator.h"
-#include "../transforms/diffie_hellman.h"
-#include "../payloads/sa_payload.h"
-#include "../payloads/ke_payload.h"
-#include "../payloads/nonce_payload.h"
+#include <globals.h>
+#include <utils/allocator.h>
+#include <payloads/sa_payload.h>
+#include <payloads/ke_payload.h>
+#include <payloads/nonce_payload.h>
+#include <transforms/diffie_hellman.h>
 
 /**
  * Private data of a ike_sa_init_requested_t object.

Source/charon/states/ike_sa_init_requested.h

@@ -24,10 +24,10 @@
 #ifndef IKE_SA_INIT_REQUESTED_H_
 #define IKE_SA_INIT_REQUESTED_H_
 
-#include "state.h"
-#include "../types.h"
-#include "../transforms/diffie_hellman.h"
-#include "../ike_sa.h"
+#include <types.h>
+#include <ike_sa.h>
+#include <states/state.h>
+#include <transforms/diffie_hellman.h>
 
 /**
  * @brief This class represents an IKE_SA state when requested an IKE_SA_INIT

Source/charon/states/ike_sa_init_responded.c

@@ -22,7 +22,7 @@
  
 #include "ike_sa_init_responded.h"
 
-#include "../utils/allocator.h"
+#include <utils/allocator.h>
 
 /**
  * Private data of a ike_sa_init_responded_t object.

Source/charon/states/ike_sa_init_responded.h

@@ -23,9 +23,8 @@
 #ifndef IKE_SA_INIT_RESPONDED_H_
 #define IKE_SA_INIT_RESPONDED_H_
 
-#include "state.h"
-
-#include "../ike_sa.h"
+#include <ike_sa.h>
+#include <states/state.h>
 
 /**
  * @brief This class represents an IKE_SA state when responded to an IKE_SA_INIT request

Source/charon/states/initiator_init.c

@@ -23,14 +23,14 @@
 #include "initiator_init.h"
 
 
-#include "state.h"
-#include "ike_sa_init_requested.h"
-#include "../globals.h"
-#include "../utils/allocator.h"
-#include "../transforms/diffie_hellman.h"
-#include "../payloads/sa_payload.h"
-#include "../payloads/ke_payload.h"
-#include "../payloads/nonce_payload.h"
+#include <globals.h>
+#include <states/state.h>
+#include <states/ike_sa_init_requested.h>
+#include <utils/allocator.h>
+#include <transforms/diffie_hellman.h>
+#include <payloads/sa_payload.h>
+#include <payloads/ke_payload.h>
+#include <payloads/nonce_payload.h>
 
 
 /**

Source/charon/states/initiator_init.h

@@ -24,9 +24,9 @@
 #ifndef INITIATOR_INIT_H_
 #define INITIATOR_INIT_H_
 
-#include "state.h"
+#include <ike_sa.h>
+#include <states/state.h>
 
-#include "../ike_sa.h"
 
 /**
  * @brief This class represents an IKE_SA state when initializing

Source/charon/states/responder_init.c

@@ -22,13 +22,14 @@
  
 #include "responder_init.h"
 
-#include "ike_sa_init_responded.h"
-#include "../globals.h"
-#include "../utils/allocator.h"
-#include "../payloads/sa_payload.h"
-#include "../payloads/ke_payload.h"
-#include "../payloads/nonce_payload.h"
-#include "../transforms/diffie_hellman.h"
+#include <globals.h>
+#include <states/state.h>
+#include <states/ike_sa_init_responded.h>
+#include <utils/allocator.h>
+#include <payloads/sa_payload.h>
+#include <payloads/ke_payload.h>
+#include <payloads/nonce_payload.h>
+#include <transforms/diffie_hellman.h>
 
 /**
  * Private data of a responder_init_t object.

Source/charon/states/responder_init.h

@@ -23,9 +23,8 @@
 #ifndef RESPONDER_INIT_H_
 #define RESPONDER_INIT_H_
 
-#include "state.h"
-
-#include "../ike_sa.h"
+#include <ike_sa.h>
+#include <states/state.h>
 
 /**
  * @brief This class represents an IKE_SA state when initializing

Source/charon/states/state.h

@@ -23,9 +23,9 @@
 #ifndef STATE_H_
 #define STATE_H_
 
-#include "../definitions.h"
-#include "../types.h"
-#include "../message.h"
+#include <definitions.h>
+#include <types.h>
+#include <message.h>
 
 extern mapping_t ike_sa_state_m[];