- changed include paths
authorMartin Willi <martin@strongswan.org>
Wed, 23 Nov 2005 09:24:35 +0000 (09:24 -0000)
committerMartin Willi <martin@strongswan.org>
Wed, 23 Nov 2005 09:24:35 +0000 (09:24 -0000)
76 files changed:
Source/charon/configuration_manager.c
Source/charon/configuration_manager.h
Source/charon/daemon.c
Source/charon/daemon.h
Source/charon/definitions.h
Source/charon/generator.c
Source/charon/generator.h
Source/charon/globals.h
Source/charon/ike_sa.c
Source/charon/ike_sa.h
Source/charon/ike_sa_id.c
Source/charon/ike_sa_manager.c
Source/charon/ike_sa_manager.h
Source/charon/message.c
Source/charon/message.h
Source/charon/packet.c
Source/charon/packet.h
Source/charon/parser.c
Source/charon/parser.h
Source/charon/receiver.c
Source/charon/receiver.h
Source/charon/scheduler.c
Source/charon/scheduler.h
Source/charon/sender.c
Source/charon/sender.h
Source/charon/socket.c
Source/charon/socket.h
Source/charon/states/ike_auth_requested.c
Source/charon/states/ike_auth_requested.h
Source/charon/states/ike_sa_established.c
Source/charon/states/ike_sa_established.h
Source/charon/states/ike_sa_init_requested.c
Source/charon/states/ike_sa_init_requested.h
Source/charon/states/ike_sa_init_responded.c
Source/charon/states/ike_sa_init_responded.h
Source/charon/states/initiator_init.c
Source/charon/states/initiator_init.h
Source/charon/states/responder_init.c
Source/charon/states/responder_init.h
Source/charon/states/state.h
Source/charon/thread_pool.c
Source/charon/thread_pool.h
Source/charon/transforms/crypters/crypter.h
Source/charon/transforms/diffie_hellman.c
Source/charon/transforms/diffie_hellman.h
Source/charon/transforms/hashers/hasher.c
Source/charon/transforms/hashers/hasher.h
Source/charon/transforms/hashers/hasher_md5.c
Source/charon/transforms/hashers/hasher_md5.h
Source/charon/transforms/hashers/hasher_sha1.c
Source/charon/transforms/hashers/hasher_sha1.h
Source/charon/transforms/hmac.c
Source/charon/transforms/hmac.h
Source/charon/transforms/prf_plus.c
Source/charon/transforms/prf_plus.h
Source/charon/transforms/prfs/prf.c
Source/charon/transforms/prfs/prf.h
Source/charon/transforms/prfs/prf_hmac.c
Source/charon/transforms/prfs/prf_hmac.h
Source/charon/transforms/signers/signer.h
Source/charon/types.h
Source/charon/utils/allocator.h
Source/charon/utils/gmp_helper.c
Source/charon/utils/gmp_helper.h
Source/charon/utils/host.c
Source/charon/utils/host.h
Source/charon/utils/linked_list.c
Source/charon/utils/linked_list.h
Source/charon/utils/logger.c
Source/charon/utils/logger.h
Source/charon/utils/logger_manager.c
Source/charon/utils/logger_manager.h
Source/charon/utils/randomizer.c
Source/charon/utils/randomizer.h
Source/charon/utils/tester.c
Source/charon/utils/tester.h

index 2fa9da8..740946f 100644 (file)
 
 #include "configuration_manager.h"
 
-#include "types.h"
-#include "globals.h"
-#include "utils/allocator.h"
-#include "payloads/nonce_payload.h"
-#include "payloads/proposal_substructure.h"
-#include "payloads/ke_payload.h"
-#include "payloads/transform_attribute.h"
+#include <types.h>
+#include <globals.h>
+#include <utils/allocator.h>
+#include <payloads/nonce_payload.h>
+#include <payloads/proposal_substructure.h>
+#include <payloads/ke_payload.h>
+#include <payloads/transform_attribute.h>
 
 /**
  * Private data of an configuration_t object
index 9e7167e..3fd9024 100644 (file)
 #ifndef CONFIGURATION_MANAGER_H_
 #define CONFIGURATION_MANAGER_H_
 
-#include "types.h"
-#include "utils/linked_list.h"
-#include "utils/host.h"
-#include "payloads/transform_substructure.h"
-#include "transforms/prfs/prf.h"
-#include "transforms/signers/signer.h"
-#include "transforms/crypters/crypter.h"
+#include <types.h>
+#include <utils/linked_list.h>
+#include <utils/host.h>
+#include <payloads/transform_substructure.h>
+#include <transforms/prfs/prf.h>
+#include <transforms/signers/signer.h>
+#include <transforms/crypters/crypter.h>
 
 /**
  * @brief Manages all configuration aspects of the daemon.
index 6aeef31..b3e9b61 100644 (file)
@@ -132,15 +132,15 @@ int main()
                destroy_and_exit(-1);
        }
        
-       int i;
-       for(i = 0; i<1; i++)
-       {
-               initiate_ike_sa_job_t *initiate_job;
-               
-               initiate_job = initiate_ike_sa_job_create("pinflb30");
-               global_event_queue->add_relative(global_event_queue, (job_t*)initiate_job, i * 1000);
-               
-       }
+//     int i;
+//     for(i = 0; i<1; i++)
+//     {
+//             initiate_ike_sa_job_t *initiate_job;
+//             
+//             initiate_job = initiate_ike_sa_job_create("pinflb30");
+//             global_event_queue->add_relative(global_event_queue, (job_t*)initiate_job, i * 1000);
+//             
+//     }
        
        logger->log(logger,CONTROL|MORE,"going to wait for exit signal");
        /* go and handle signals*/
index d1df42f..3d83286 100644 (file)
@@ -23,7 +23,7 @@
 #ifndef DAEMON_H_
 #define DAEMON_H_
 
-#include "globals.h"
+#include <globals.h>
 
 #define DAEMON_NAME "charon"
 
index 9909cc9..c3c481a 100644 (file)
@@ -71,7 +71,9 @@
 #define min(x,y) (x < y ? x : y)
 
 
-
+/**
+ * mapping entry which defines the end of a mapping_t array
+ */
 #define MAPPING_END (-1)
 
 /**
index 247b65f..10b0c8c 100644 (file)
 
 #include "generator.h"
 
-#include "types.h"
-#include "globals.h"
-#include "utils/allocator.h"
-#include "utils/linked_list.h"
-#include "utils/logger_manager.h"
-#include "payloads/payload.h"
-#include "payloads/proposal_substructure.h"
-#include "payloads/transform_substructure.h"
-#include "payloads/sa_payload.h"
-#include "payloads/ke_payload.h"
-#include "payloads/notify_payload.h"
-#include "payloads/nonce_payload.h"
+#include <types.h>
+#include <globals.h>
+#include <utils/allocator.h>
+#include <utils/linked_list.h>
+#include <utils/logger_manager.h>
+#include <payloads/payload.h>
+#include <payloads/proposal_substructure.h>
+#include <payloads/transform_substructure.h>
+#include <payloads/sa_payload.h>
+#include <payloads/ke_payload.h>
+#include <payloads/notify_payload.h>
+#include <payloads/nonce_payload.h>
 
 /**
  * Private part of a generator_t object
index 0b0452b..efad1c1 100644 (file)
@@ -23,9 +23,9 @@
 #ifndef GENERATOR_H_
 #define GENERATOR_H_
 
-#include "types.h"
-#include "payloads/encodings.h"
-#include "payloads/payload.h"
+#include <types.h>
+#include <payloads/encodings.h>
+#include <payloads/payload.h>
 
 /**
  * Generating is done in a data buffer.
index 96d5e16..137ac0d 100644 (file)
 #ifndef GLOBALS_H_
 #define GLOBALS_H_
 
-#include "socket.h"
-#include "queues/send_queue.h"
-#include "queues/job_queue.h"
-#include "queues/event_queue.h"
-#include "utils/logger_manager.h"
-#include "ike_sa_manager.h"
-#include "configuration_manager.h"
+#include <socket.h>
+#include <ike_sa_manager.h>
+#include <queues/send_queue.h>
+#include <queues/job_queue.h>
+#include <queues/event_queue.h>
+#include <utils/logger_manager.h>
+#include <configuration_manager.h>
 
 
 extern socket_t *global_socket;
index 1de3e9a..bd7af05 100644 (file)
 
 #include "ike_sa.h"
 
-#include "types.h"
-#include "globals.h"
-#include "definitions.h"
-#include "utils/allocator.h"
-#include "utils/linked_list.h"
-#include "utils/logger_manager.h"
-#include "utils/randomizer.h"
-#include "transforms/diffie_hellman.h"
-#include "transforms/prf_plus.h"
-#include "payloads/sa_payload.h"
-#include "payloads/nonce_payload.h"
-#include "payloads/ke_payload.h"
-#include "payloads/transform_substructure.h"
-#include "payloads/transform_attribute.h"
-#include "states/initiator_init.h"
-#include "states/responder_init.h"
+#include <types.h>
+#include <globals.h>
+#include <definitions.h>
+#include <utils/allocator.h>
+#include <utils/linked_list.h>
+#include <utils/logger_manager.h>
+#include <utils/randomizer.h>
+#include <transforms/diffie_hellman.h>
+#include <transforms/prf_plus.h>
+#include <payloads/sa_payload.h>
+#include <payloads/nonce_payload.h>
+#include <payloads/ke_payload.h>
+#include <payloads/transform_substructure.h>
+#include <payloads/transform_attribute.h>
+#include <states/initiator_init.h>
+#include <states/responder_init.h>
 
 
 
index c8d728b..b47d8e5 100644 (file)
 #ifndef IKE_SA_H_
 #define IKE_SA_H_
 
-#include "types.h"
-#include "message.h"
-#include "ike_sa_id.h"
-#include "utils/logger.h"
-#include "utils/randomizer.h"
-#include "states/state.h"
-#include "transforms/prfs/prf.h"
-#include "transforms/crypters/crypter.h"
-#include "transforms/signers/signer.h"
+#include <types.h>
+#include <message.h>
+#include <ike_sa_id.h>
+#include <utils/logger.h>
+#include <utils/randomizer.h>
+#include <states/state.h>
+#include <transforms/prfs/prf.h>
+#include <transforms/crypters/crypter.h>
+#include <transforms/signers/signer.h>
 
 
 
index 8e8f5b8..52b1a9c 100644 (file)
@@ -25,8 +25,8 @@
 
 #include "ike_sa_id.h"
 
-#include "types.h"
-#include "utils/allocator.h"
+#include <types.h>
+#include <utils/allocator.h>
 
 /**
  * Private data of an ike_sa_id object
index 107b38d..ed60e6d 100644 (file)
 
 #include "ike_sa_manager.h"
 
-#include "globals.h"
-#include "ike_sa_id.h"
-#include "utils/allocator.h"
-#include "utils/logger.h"
-#include "utils/logger_manager.h"
-#include "utils/linked_list.h"
+#include <globals.h>
+#include <ike_sa_id.h>
+#include <utils/allocator.h>
+#include <utils/logger.h>
+#include <utils/logger_manager.h>
+#include <utils/linked_list.h>
 
 /**
  * @brief An entry in the linked list, contains IKE_SA, locking and lookup data.
index 6680beb..71ac33b 100644 (file)
@@ -23,8 +23,8 @@
 #ifndef IKE_SA_MANAGER_H_
 #define IKE_SA_MANAGER_H_
 
-#include "types.h"
-#include "ike_sa.h"
+#include <types.h>
+#include <ike_sa.h>
 
 
 /**
index 5d888eb..cb48e50 100644 (file)
 
 #include "message.h"
 
-#include "types.h"
-#include "globals.h"
-#include "ike_sa_id.h"
-#include "generator.h"
-#include "utils/linked_list.h"
-#include "utils/allocator.h"
-#include "utils/logger_manager.h"
-#include "payloads/encodings.h"
-#include "payloads/payload.h"
-#include "parser.h"
+#include <types.h>
+#include <globals.h>
+#include <ike_sa_id.h>
+#include <generator.h>
+#include <parser.h>
+#include <utils/linked_list.h>
+#include <utils/allocator.h>
+#include <utils/logger_manager.h>
+#include <payloads/encodings.h>
+#include <payloads/payload.h>
 
 
 /**
index fba719c..4850250 100644 (file)
 #ifndef MESSAGE_H_
 #define MESSAGE_H_
 
-#include "types.h"
-#include "packet.h"
-#include "ike_sa_id.h"
-#include "payloads/ike_header.h"
-#include "utils/linked_list.h"
+#include <types.h>
+#include <packet.h>
+#include <ike_sa_id.h>
+#include <payloads/ike_header.h>
+#include <utils/linked_list.h>
 
 
 
index a3c5f62..f09b18a 100644 (file)
@@ -23,7 +23,7 @@
 
 #include "packet.h"
 
-#include "utils/allocator.h"
+#include <utils/allocator.h>
 
 
 /**
index b586440..10488e0 100644 (file)
@@ -24,8 +24,8 @@
 #define PACKET_H_
 
 
-#include "types.h"
-#include "utils/host.h"
+#include <types.h>
+#include <utils/host.h>
 
 
 
index 3d3c00e..22b60bd 100644 (file)
 
 #include "parser.h"
 
-#include "types.h"
-#include "definitions.h"
-#include "globals.h"
-#include "utils/allocator.h"
-#include "utils/logger.h"
-#include "utils/linked_list.h"
-#include "payloads/encodings.h"
-#include "payloads/payload.h"
-#include "payloads/sa_payload.h"
-#include "payloads/proposal_substructure.h"
-#include "payloads/transform_substructure.h"
-#include "payloads/transform_attribute.h"
-#include "payloads/ke_payload.h"
-#include "payloads/nonce_payload.h"
-#include "payloads/notify_payload.h"
+#include <types.h>
+#include <definitions.h>
+#include <globals.h>
+#include <utils/allocator.h>
+#include <utils/logger.h>
+#include <utils/linked_list.h>
+#include <payloads/encodings.h>
+#include <payloads/payload.h>
+#include <payloads/sa_payload.h>
+#include <payloads/proposal_substructure.h>
+#include <payloads/transform_substructure.h>
+#include <payloads/transform_attribute.h>
+#include <payloads/ke_payload.h>
+#include <payloads/nonce_payload.h>
+#include <payloads/notify_payload.h>
 
 
 
index 14461e2..bde0bbe 100644 (file)
@@ -23,9 +23,9 @@
 #ifndef PARSER_H_
 #define PARSER_H_
 
-#include "types.h"
-#include "payloads/encodings.h"
-#include "payloads/payload.h"
+#include <types.h>
+#include <payloads/encodings.h>
+#include <payloads/payload.h>
 
 
 /**
index 309f2de..75ce071 100644 (file)
 
 #include "receiver.h"
 
-#include "jobs/job.h"
-#include "socket.h"
-#include "packet.h"
-#include "globals.h"
-#include "queues/job_queue.h"
-#include "utils/allocator.h"
-#include "utils/logger_manager.h"
+#include <socket.h>
+#include <packet.h>
+#include <globals.h>
+#include <jobs/job.h>
+#include <queues/job_queue.h>
+#include <utils/allocator.h>
+#include <utils/logger_manager.h>
 
 /**
  * Private data of a receiver object
index b864556..49f71be 100644 (file)
@@ -23,7 +23,7 @@
 #ifndef RECEIVER_H_
 #define RECEIVER_H_
 
-#include "types.h"
+#include <types.h>
 
 /**
  * @brief A Receiver object which receives packets on the socket and adds them to the job-queue
index 641d0f3..d7f0694 100644 (file)
 
 #include "scheduler.h"
 
-#include "globals.h"
-#include "definitions.h"
-#include "utils/allocator.h"
-#include "utils/logger_manager.h"
-#include "queues/job_queue.h"
+#include <globals.h>
+#include <definitions.h>
+#include <utils/allocator.h>
+#include <utils/logger_manager.h>
+#include <queues/job_queue.h>
 
 /**
  * Private data of a scheduler object
index 36ba1db..8aa8fbb 100644 (file)
@@ -23,7 +23,7 @@
 #ifndef SCHEDULER_H_
 #define SCHEDULER_H_
 
-#include "types.h"
+#include <types.h>
 
 /**
  * @brief The scheduler, looks for timed events in event-queue and adds them
index 224bafa..074d30b 100644 (file)
 
 #include "sender.h"
 
-#include "socket.h"
-#include "packet.h"
-#include "globals.h"
-#include "queues/send_queue.h"
-#include "utils/allocator.h"
-#include "utils/logger_manager.h"
+#include <socket.h>
+#include <packet.h>
+#include <globals.h>
+#include <queues/send_queue.h>
+#include <utils/allocator.h>
+#include <utils/logger_manager.h>
 
 /**
  * Private data of a sender object
index c018ba2..386e429 100644 (file)
@@ -23,7 +23,7 @@
 #ifndef SENDER_H_
 #define SENDER_H_
 
-#include "types.h"
+#include <types.h>
 
 /**
  * @brief A Sender object which sends packets on the socket
index 7774f18..fc652b5 100644 (file)
@@ -32,9 +32,9 @@
 
 #include "socket.h"
 
-#include "globals.h"
-#include "utils/allocator.h"
-#include "utils/logger_manager.h"
+#include <globals.h>
+#include <utils/allocator.h>
+#include <utils/logger_manager.h>
 
 typedef struct private_socket_s private_socket_t;
 
index edb2732..b69c50c 100644 (file)
@@ -26,8 +26,8 @@
 #define SOCKET_H_
 
 
-#include "types.h"
-#include "packet.h"
+#include <types.h>
+#include <packet.h>
 
 
 /**
index eb0e2b8..b1033eb 100644 (file)
@@ -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.
index 2cc20d7..fc59706 100644 (file)
@@ -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.
index 1fc2f11..0a0dd4b 100644 (file)
@@ -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.
index 55fc85a..a86a3dc 100644 (file)
@@ -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
index 56fb3fe..4d54530 100644 (file)
  
 #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.
index 09e1721..077d95e 100644 (file)
 #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
index f88436c..885d4be 100644 (file)
@@ -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.
index ee765e4..5530ba3 100644 (file)
@@ -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
index 6daabc5..265bf3a 100644 (file)
 #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>
 
 
 /**
index 3458ad4..0b1b3a5 100644 (file)
@@ -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
index 30191ba..869d868 100644 (file)
  
 #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.
index 4d2d2f3..ea3dbe9 100644 (file)
@@ -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
index cc66d1f..13a5133 100644 (file)
@@ -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[];
 
index d98b621..876f6c7 100644 (file)
 
 #include "thread_pool.h"
  
-#include "globals.h"
-#include "queues/job_queue.h"
-#include "utils/allocator.h"
-#include "utils/logger.h"
+#include <globals.h>
+#include <queues/job_queue.h>
+#include <utils/allocator.h>
+#include <utils/logger.h>
 
 /**
  * @brief structure with private members for thread_pool_t
index c5e8fa9..54022e4 100644 (file)
@@ -25,7 +25,7 @@
 
 #include <stdlib.h>
 
-#include "types.h"
+#include <types.h>
 
 /**
  * @brief A thread_pool contains a pool of threads processing the job queue.
index 4a259de..91ed545 100644 (file)
@@ -23,7 +23,7 @@
 #ifndef CRYPTER_H_
 #define CRYPTER_H_
 
-#include "../../payloads/transform_substructure.h"
+#include <payloads/transform_substructure.h>
 
 
 /**
index 5ff0690..cd2721b 100644 (file)
 
 #include "diffie_hellman.h"
 
-#include "../payloads/transform_substructure.h"
-#include "../utils/allocator.h"
-#include "../utils/randomizer.h"
-#include "../utils/gmp_helper.h"
+#include <payloads/transform_substructure.h>
+#include <utils/allocator.h>
+#include <utils/randomizer.h>
+#include <utils/gmp_helper.h>
 
 
 /**
index f0fb589..ff3921e 100644 (file)
@@ -23,8 +23,8 @@
 #ifndef DIFFIE_HELLMAN_H_
 #define DIFFIE_HELLMAN_H_
 
-#include "../types.h"
-#include "../payloads/transform_substructure.h"
+#include <types.h>
+#include <payloads/transform_substructure.h>
 
 /**
  * Object representing a diffie hellman exchange
index f6acaed..983ae4b 100644 (file)
@@ -23,8 +23,8 @@
 
 #include "hasher.h"
 
-#include "hasher_sha1.h"
-#include "hasher_md5.h"
+#include <transforms/hashers/hasher_sha1.h>
+#include <transforms/hashers/hasher_md5.h>
 
 
 
index 534d0bf..a20ec68 100644 (file)
@@ -24,7 +24,7 @@
 #define HASHER_H_
 
 
-#include "../../types.h"
+#include <types.h>
 
 /**
  * algorithms to use for hashing
index 05de2e0..f671bef 100644 (file)
@@ -28,8 +28,8 @@
 
 #include "hasher_md5.h"
 
-#include "../../definitions.h"
-#include "../../utils/allocator.h"
+#include <definitions.h>
+#include <utils/allocator.h>
 
 #define BLOCK_SIZE_MD5 16
 
index f3504ea..cc7c6c3 100644 (file)
@@ -24,7 +24,7 @@
 #ifndef HASHER_MD5_H_
 #define HASHER_MD5_H_
 
-#include "hasher.h"
+#include <transforms/hashers/hasher.h>
 
 
 /**
index e786271..b8a7d14 100644 (file)
@@ -26,8 +26,8 @@
 
 #include "hasher_sha1.h"
 
-#include "../../definitions.h"
-#include "../../utils/allocator.h"
+#include <definitions.h>
+#include <utils/allocator.h>
 
 #define BLOCK_SIZE_SHA1 20
 
index c76f69e..76aa904 100644 (file)
@@ -24,7 +24,7 @@
 #ifndef HASHER_SHA1_H_
 #define HASHER_SHA1_H_
 
-#include "hasher.h"
+#include <transforms/hashers/hasher.h>
 
 
 /**
index 4ec9de1..760d562 100644 (file)
@@ -24,7 +24,7 @@
 
 #include "hmac.h"
 
-#include "../utils/allocator.h"
+#include <utils/allocator.h>
 
 /**
  * Private data of an hmac_t object.
index 25b59d0..6de4247 100644 (file)
@@ -25,7 +25,7 @@
 #define HMAC_H_
 
 
-#include "hashers/hasher.h"
+#include <transforms/hashers/hasher.h>
 
 
 /**
index 54d1815..4b1185d 100644 (file)
@@ -23,8 +23,8 @@
 
 #include "prf_plus.h"
 
-#include "../utils/allocator.h"
-#include "../definitions.h"
+#include <utils/allocator.h>
+#include <definitions.h>
 
 /**
  * Private data of an prf_plus_t object.
index 6d1fb96..51af4d3 100644 (file)
@@ -24,7 +24,7 @@
 #define PRF_PLUS_H_
 
 
-#include "prfs/prf.h"
+#include <transforms/prfs/prf.h>
 
 
 /**
index e52c331..ebf28d5 100644 (file)
@@ -23,8 +23,8 @@
 
 #include "prf.h"
 
-#include "prf_hmac.h"
-#include "../hashers/hasher.h"
+#include <transforms/hashers/hasher.h>
+#include <transforms/prfs/prf_hmac.h>
 
 
 /*
index 1477c4a..72d543b 100644 (file)
@@ -23,7 +23,7 @@
 #ifndef PRF_H_
 #define PRF_H_
 
-#include "../../payloads/transform_substructure.h"
+#include <payloads/transform_substructure.h>
 
 
 /**
index b16554e..9668e1b 100644 (file)
@@ -23,8 +23,8 @@
 
 #include "prf_hmac.h"
 
-#include "../../utils/allocator.h"
-#include "../hmac.h"
+#include <utils/allocator.h>
+#include <transforms/hmac.h>
 
 typedef struct private_prf_hmac_s private_prf_hmac_t;
 
index 3f5a866..22e993b 100644 (file)
@@ -26,8 +26,8 @@
 
 #include "prf.h"
 
-#include "../../types.h"
-#include "../hashers/hasher.h"
+#include <types.h>
+#include <transforms/hashers/hasher.h>
 
 /**
  * Object representing a prf using HMAC
index e1fa7b4..3dbc72f 100644 (file)
@@ -23,7 +23,7 @@
 #ifndef SIGNER_H_
 #define SIGNER_H_
 
-#include "../../payloads/transform_substructure.h"
+#include <payloads/transform_substructure.h>
 
 
 /**
index 0777810..b3021dd 100644 (file)
@@ -28,7 +28,7 @@
 #include <sys/types.h>
 #include <stdlib.h>
 
-#include "definitions.h"
+#include <definitions.h>
 
 typedef enum status_e {
        SUCCESS,
index 8006911..e3d81b3 100644 (file)
@@ -28,7 +28,7 @@
 #include <stddef.h>
 #include <string.h>
 
-#include "../types.h"
+#include <types.h>
 
 
 /**
index c9417da..4e4a35c 100644 (file)
@@ -25,8 +25,8 @@
  
 #include "gmp_helper.h"
 
-#include "allocator.h"
-#include "randomizer.h"
+#include <utils/allocator.h>
+#include <utils/randomizer.h>
 
 /**
  * Number of times the probabilistic primality test is applied
index c1c6524..015f749 100644 (file)
@@ -28,7 +28,7 @@
 
 #include <gmp.h>
 
-#include "../types.h"
+#include <types.h>
 
 /**
  * Class with helper functions to manipulate gmp values 
index 100cea6..c2b01d1 100644 (file)
  * for more details.
  */
 
-
-
 #include "host.h"
 
-#include "allocator.h"
+#include <utils/allocator.h>
 
 /**
  * @brief The logger object.
index 27d20d7..f592e67 100644 (file)
@@ -30,7 +30,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include "../types.h"
+#include <types.h>
 
 /**
  * @brief The logger object
index 910b275..42dcf56 100644 (file)
@@ -24,7 +24,7 @@
 
 #include "linked_list.h"
 
-#include "allocator.h"
+#include <utils/allocator.h>
 
 
 typedef struct linked_list_element_s linked_list_element_t;
index 016f9b0..eaea27f 100644 (file)
@@ -23,7 +23,7 @@
 #ifndef LINKED_LIST_H_
 #define LINKED_LIST_H_
 
-#include "../types.h"
+#include <types.h>
 
 /**
  * @brief Iterator for a linked list
index fd1b567..f06a571 100644 (file)
@@ -29,8 +29,8 @@
 
 #include "logger.h"
 
-#include "../daemon.h"
-#include "allocator.h"
+#include <daemon.h>
+#include <utils/allocator.h>
 
 /**
  * Maximum length of al log entry (only used for logger_s.log)
index 286491f..3c4b345 100644 (file)
@@ -24,7 +24,8 @@
 #define LOGGER_H_
 
 #include <stdio.h>
-#include "../types.h"
+
+#include <types.h>
 
 /**
  * @brief Log Levels supported by the logger object
index 0601eae..aa2fdf2 100644 (file)
@@ -23,9 +23,9 @@
  
 #include "logger_manager.h"
  
-#include "allocator.h"
-#include "linked_list.h"
-#include "../definitions.h"
+#include <definitions.h>
+#include <utils/allocator.h>
+#include <utils/linked_list.h>
 
 mapping_t logger_context_t_mappings[] = {
        {PARSER, "PARSER"},
index 04fca23..1553963 100644 (file)
@@ -25,7 +25,7 @@
 
 #include <pthread.h>
 
-#include "logger.h"
+#include <utils/logger.h>
 
 /**
  * @brief Context of a specific logger 
index 9af7d52..e59eeda 100644 (file)
@@ -28,7 +28,7 @@
  
 #include "randomizer.h"
 
-#include "allocator.h"
+#include <utils/allocator.h>
 
 /**
  * Default random device used when no device is given.
index 0d37572..4531f03 100644 (file)
@@ -23,7 +23,7 @@
 #ifndef RANDOMIZER_H_
 #define RANDOMIZER_H_
 
-#include "../types.h"
+#include <types.h>
 
 /**
  * Object representing an randomizer
index f2019c2..0742240 100644 (file)
@@ -28,9 +28,9 @@
 
 #include "tester.h"
 
-#include "allocator.h"
-#include "linked_list.h"
-#include "../queues/job_queue.h"
+#include <utils/allocator.h>
+#include <utils/linked_list.h>
+#include <queues/job_queue.h>
 
 /**
  * @brief Private Variables and Functions of tester class
index 69b7de0..0ecd8ba 100644 (file)
@@ -25,7 +25,7 @@
 
 #include <stdio.h>
 
-#include "../types.h"
+#include <types.h>