diff options
Diffstat (limited to 'Source/charon')
76 files changed, 245 insertions, 245 deletions
diff --git a/Source/charon/configuration_manager.c b/Source/charon/configuration_manager.c index 2fa9da849..740946fe8 100644 --- a/Source/charon/configuration_manager.c +++ b/Source/charon/configuration_manager.c @@ -26,13 +26,13 @@ #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 diff --git a/Source/charon/configuration_manager.h b/Source/charon/configuration_manager.h index 9e7167e35..3fd902420 100644 --- a/Source/charon/configuration_manager.h +++ b/Source/charon/configuration_manager.h @@ -23,13 +23,13 @@ #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. diff --git a/Source/charon/daemon.c b/Source/charon/daemon.c index 6aeef31e3..b3e9b615d 100644 --- a/Source/charon/daemon.c +++ b/Source/charon/daemon.c @@ -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*/ diff --git a/Source/charon/daemon.h b/Source/charon/daemon.h index d1df42f88..3d83286b1 100644 --- a/Source/charon/daemon.h +++ b/Source/charon/daemon.h @@ -23,7 +23,7 @@ #ifndef DAEMON_H_ #define DAEMON_H_ -#include "globals.h" +#include <globals.h> #define DAEMON_NAME "charon" diff --git a/Source/charon/definitions.h b/Source/charon/definitions.h index 9909cc98a..c3c481af7 100644 --- a/Source/charon/definitions.h +++ b/Source/charon/definitions.h @@ -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) /** diff --git a/Source/charon/generator.c b/Source/charon/generator.c index 247b65fb4..10b0c8c9e 100644 --- a/Source/charon/generator.c +++ b/Source/charon/generator.c @@ -28,18 +28,18 @@ #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 diff --git a/Source/charon/generator.h b/Source/charon/generator.h index 0b0452b9a..efad1c183 100644 --- a/Source/charon/generator.h +++ b/Source/charon/generator.h @@ -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. diff --git a/Source/charon/globals.h b/Source/charon/globals.h index 96d5e164b..137ac0d92 100644 --- a/Source/charon/globals.h +++ b/Source/charon/globals.h @@ -23,13 +23,13 @@ #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; diff --git a/Source/charon/ike_sa.c b/Source/charon/ike_sa.c index 1de3e9a0c..bd7af05ea 100644 --- a/Source/charon/ike_sa.c +++ b/Source/charon/ike_sa.c @@ -23,22 +23,22 @@ #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> diff --git a/Source/charon/ike_sa.h b/Source/charon/ike_sa.h index c8d728b86..b47d8e571 100644 --- a/Source/charon/ike_sa.h +++ b/Source/charon/ike_sa.h @@ -24,15 +24,15 @@ #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> diff --git a/Source/charon/ike_sa_id.c b/Source/charon/ike_sa_id.c index 8e8f5b8b1..52b1a9c8d 100644 --- a/Source/charon/ike_sa_id.c +++ b/Source/charon/ike_sa_id.c @@ -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 diff --git a/Source/charon/ike_sa_manager.c b/Source/charon/ike_sa_manager.c index 107b38da7..ed60e6d87 100644 --- a/Source/charon/ike_sa_manager.c +++ b/Source/charon/ike_sa_manager.c @@ -25,12 +25,12 @@ #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. diff --git a/Source/charon/ike_sa_manager.h b/Source/charon/ike_sa_manager.h index 6680bebaa..71ac33bc2 100644 --- a/Source/charon/ike_sa_manager.h +++ b/Source/charon/ike_sa_manager.h @@ -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> /** diff --git a/Source/charon/message.c b/Source/charon/message.c index 5d888ebaf..cb48e5061 100644 --- a/Source/charon/message.c +++ b/Source/charon/message.c @@ -24,16 +24,16 @@ #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> /** diff --git a/Source/charon/message.h b/Source/charon/message.h index fba719c5d..4850250fd 100644 --- a/Source/charon/message.h +++ b/Source/charon/message.h @@ -23,11 +23,11 @@ #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> diff --git a/Source/charon/packet.c b/Source/charon/packet.c index a3c5f6225..f09b18ae3 100644 --- a/Source/charon/packet.c +++ b/Source/charon/packet.c @@ -23,7 +23,7 @@ #include "packet.h" -#include "utils/allocator.h" +#include <utils/allocator.h> /** diff --git a/Source/charon/packet.h b/Source/charon/packet.h index b586440b6..10488e0aa 100644 --- a/Source/charon/packet.h +++ b/Source/charon/packet.h @@ -24,8 +24,8 @@ #define PACKET_H_ -#include "types.h" -#include "utils/host.h" +#include <types.h> +#include <utils/host.h> diff --git a/Source/charon/parser.c b/Source/charon/parser.c index 3d3c00e40..22b60bdc4 100644 --- a/Source/charon/parser.c +++ b/Source/charon/parser.c @@ -25,21 +25,21 @@ #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> diff --git a/Source/charon/parser.h b/Source/charon/parser.h index 14461e282..bde0bbe43 100644 --- a/Source/charon/parser.h +++ b/Source/charon/parser.h @@ -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> /** diff --git a/Source/charon/receiver.c b/Source/charon/receiver.c index 309f2de98..75ce071dd 100644 --- a/Source/charon/receiver.c +++ b/Source/charon/receiver.c @@ -25,13 +25,13 @@ #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 diff --git a/Source/charon/receiver.h b/Source/charon/receiver.h index b864556e8..49f71be40 100644 --- a/Source/charon/receiver.h +++ b/Source/charon/receiver.h @@ -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 diff --git a/Source/charon/scheduler.c b/Source/charon/scheduler.c index 641d0f3b4..d7f0694e7 100644 --- a/Source/charon/scheduler.c +++ b/Source/charon/scheduler.c @@ -25,11 +25,11 @@ #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 diff --git a/Source/charon/scheduler.h b/Source/charon/scheduler.h index 36ba1dbd4..8aa8fbbef 100644 --- a/Source/charon/scheduler.h +++ b/Source/charon/scheduler.h @@ -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 diff --git a/Source/charon/sender.c b/Source/charon/sender.c index 224bafa85..074d30b65 100644 --- a/Source/charon/sender.c +++ b/Source/charon/sender.c @@ -25,12 +25,12 @@ #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 diff --git a/Source/charon/sender.h b/Source/charon/sender.h index c018ba2a3..386e429ee 100644 --- a/Source/charon/sender.h +++ b/Source/charon/sender.h @@ -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 diff --git a/Source/charon/socket.c b/Source/charon/socket.c index 7774f180e..fc652b557 100644 --- a/Source/charon/socket.c +++ b/Source/charon/socket.c @@ -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; diff --git a/Source/charon/socket.h b/Source/charon/socket.h index edb273210..b69c50cf1 100644 --- a/Source/charon/socket.h +++ b/Source/charon/socket.h @@ -26,8 +26,8 @@ #define SOCKET_H_ -#include "types.h" -#include "packet.h" +#include <types.h> +#include <packet.h> /** diff --git a/Source/charon/states/ike_auth_requested.c b/Source/charon/states/ike_auth_requested.c index eb0e2b852..b1033eb62 100644 --- a/Source/charon/states/ike_auth_requested.c +++ b/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. diff --git a/Source/charon/states/ike_auth_requested.h b/Source/charon/states/ike_auth_requested.h index 2cc20d721..fc597066c 100644 --- a/Source/charon/states/ike_auth_requested.h +++ b/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. diff --git a/Source/charon/states/ike_sa_established.c b/Source/charon/states/ike_sa_established.c index 1fc2f116e..0a0dd4b75 100644 --- a/Source/charon/states/ike_sa_established.c +++ b/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. diff --git a/Source/charon/states/ike_sa_established.h b/Source/charon/states/ike_sa_established.h index 55fc85a96..a86a3dc43 100644 --- a/Source/charon/states/ike_sa_established.h +++ b/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 diff --git a/Source/charon/states/ike_sa_init_requested.c b/Source/charon/states/ike_sa_init_requested.c index 56fb3feaa..4d545309d 100644 --- a/Source/charon/states/ike_sa_init_requested.c +++ b/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. diff --git a/Source/charon/states/ike_sa_init_requested.h b/Source/charon/states/ike_sa_init_requested.h index 09e1721aa..077d95efb 100644 --- a/Source/charon/states/ike_sa_init_requested.h +++ b/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 diff --git a/Source/charon/states/ike_sa_init_responded.c b/Source/charon/states/ike_sa_init_responded.c index f88436c45..885d4bea6 100644 --- a/Source/charon/states/ike_sa_init_responded.c +++ b/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. diff --git a/Source/charon/states/ike_sa_init_responded.h b/Source/charon/states/ike_sa_init_responded.h index ee765e4b1..5530ba31b 100644 --- a/Source/charon/states/ike_sa_init_responded.h +++ b/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 diff --git a/Source/charon/states/initiator_init.c b/Source/charon/states/initiator_init.c index 6daabc585..265bf3afa 100644 --- a/Source/charon/states/initiator_init.c +++ b/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> /** diff --git a/Source/charon/states/initiator_init.h b/Source/charon/states/initiator_init.h index 3458ad461..0b1b3a5e4 100644 --- a/Source/charon/states/initiator_init.h +++ b/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 diff --git a/Source/charon/states/responder_init.c b/Source/charon/states/responder_init.c index 30191ba26..869d868e9 100644 --- a/Source/charon/states/responder_init.c +++ b/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. diff --git a/Source/charon/states/responder_init.h b/Source/charon/states/responder_init.h index 4d2d2f3df..ea3dbe942 100644 --- a/Source/charon/states/responder_init.h +++ b/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 diff --git a/Source/charon/states/state.h b/Source/charon/states/state.h index cc66d1f0c..13a51338b 100644 --- a/Source/charon/states/state.h +++ b/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[]; diff --git a/Source/charon/thread_pool.c b/Source/charon/thread_pool.c index d98b621a2..876f6c7df 100644 --- a/Source/charon/thread_pool.c +++ b/Source/charon/thread_pool.c @@ -27,10 +27,10 @@ #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 diff --git a/Source/charon/thread_pool.h b/Source/charon/thread_pool.h index c5e8fa997..54022e4b4 100644 --- a/Source/charon/thread_pool.h +++ b/Source/charon/thread_pool.h @@ -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. diff --git a/Source/charon/transforms/crypters/crypter.h b/Source/charon/transforms/crypters/crypter.h index 4a259dea4..91ed54573 100644 --- a/Source/charon/transforms/crypters/crypter.h +++ b/Source/charon/transforms/crypters/crypter.h @@ -23,7 +23,7 @@ #ifndef CRYPTER_H_ #define CRYPTER_H_ -#include "../../payloads/transform_substructure.h" +#include <payloads/transform_substructure.h> /** diff --git a/Source/charon/transforms/diffie_hellman.c b/Source/charon/transforms/diffie_hellman.c index 5ff069000..cd2721bd9 100644 --- a/Source/charon/transforms/diffie_hellman.c +++ b/Source/charon/transforms/diffie_hellman.c @@ -27,10 +27,10 @@ #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> /** diff --git a/Source/charon/transforms/diffie_hellman.h b/Source/charon/transforms/diffie_hellman.h index f0fb58972..ff3921e44 100644 --- a/Source/charon/transforms/diffie_hellman.h +++ b/Source/charon/transforms/diffie_hellman.h @@ -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 diff --git a/Source/charon/transforms/hashers/hasher.c b/Source/charon/transforms/hashers/hasher.c index f6acaedaa..983ae4bed 100644 --- a/Source/charon/transforms/hashers/hasher.c +++ b/Source/charon/transforms/hashers/hasher.c @@ -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> diff --git a/Source/charon/transforms/hashers/hasher.h b/Source/charon/transforms/hashers/hasher.h index 534d0bfd1..a20ec6813 100644 --- a/Source/charon/transforms/hashers/hasher.h +++ b/Source/charon/transforms/hashers/hasher.h @@ -24,7 +24,7 @@ #define HASHER_H_ -#include "../../types.h" +#include <types.h> /** * algorithms to use for hashing diff --git a/Source/charon/transforms/hashers/hasher_md5.c b/Source/charon/transforms/hashers/hasher_md5.c index 05de2e024..f671bef6c 100644 --- a/Source/charon/transforms/hashers/hasher_md5.c +++ b/Source/charon/transforms/hashers/hasher_md5.c @@ -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 diff --git a/Source/charon/transforms/hashers/hasher_md5.h b/Source/charon/transforms/hashers/hasher_md5.h index f3504ea98..cc7c6c32a 100644 --- a/Source/charon/transforms/hashers/hasher_md5.h +++ b/Source/charon/transforms/hashers/hasher_md5.h @@ -24,7 +24,7 @@ #ifndef HASHER_MD5_H_ #define HASHER_MD5_H_ -#include "hasher.h" +#include <transforms/hashers/hasher.h> /** diff --git a/Source/charon/transforms/hashers/hasher_sha1.c b/Source/charon/transforms/hashers/hasher_sha1.c index e78627178..b8a7d14cc 100644 --- a/Source/charon/transforms/hashers/hasher_sha1.c +++ b/Source/charon/transforms/hashers/hasher_sha1.c @@ -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 diff --git a/Source/charon/transforms/hashers/hasher_sha1.h b/Source/charon/transforms/hashers/hasher_sha1.h index c76f69ea5..76aa9049c 100644 --- a/Source/charon/transforms/hashers/hasher_sha1.h +++ b/Source/charon/transforms/hashers/hasher_sha1.h @@ -24,7 +24,7 @@ #ifndef HASHER_SHA1_H_ #define HASHER_SHA1_H_ -#include "hasher.h" +#include <transforms/hashers/hasher.h> /** diff --git a/Source/charon/transforms/hmac.c b/Source/charon/transforms/hmac.c index 4ec9de19c..760d56218 100644 --- a/Source/charon/transforms/hmac.c +++ b/Source/charon/transforms/hmac.c @@ -24,7 +24,7 @@ #include "hmac.h" -#include "../utils/allocator.h" +#include <utils/allocator.h> /** * Private data of an hmac_t object. diff --git a/Source/charon/transforms/hmac.h b/Source/charon/transforms/hmac.h index 25b59d0b5..6de424783 100644 --- a/Source/charon/transforms/hmac.h +++ b/Source/charon/transforms/hmac.h @@ -25,7 +25,7 @@ #define HMAC_H_ -#include "hashers/hasher.h" +#include <transforms/hashers/hasher.h> /** diff --git a/Source/charon/transforms/prf_plus.c b/Source/charon/transforms/prf_plus.c index 54d18156d..4b1185dd8 100644 --- a/Source/charon/transforms/prf_plus.c +++ b/Source/charon/transforms/prf_plus.c @@ -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. diff --git a/Source/charon/transforms/prf_plus.h b/Source/charon/transforms/prf_plus.h index 6d1fb96c7..51af4d36c 100644 --- a/Source/charon/transforms/prf_plus.h +++ b/Source/charon/transforms/prf_plus.h @@ -24,7 +24,7 @@ #define PRF_PLUS_H_ -#include "prfs/prf.h" +#include <transforms/prfs/prf.h> /** diff --git a/Source/charon/transforms/prfs/prf.c b/Source/charon/transforms/prfs/prf.c index e52c33181..ebf28d5c9 100644 --- a/Source/charon/transforms/prfs/prf.c +++ b/Source/charon/transforms/prfs/prf.c @@ -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> /* diff --git a/Source/charon/transforms/prfs/prf.h b/Source/charon/transforms/prfs/prf.h index 1477c4a8e..72d543b34 100644 --- a/Source/charon/transforms/prfs/prf.h +++ b/Source/charon/transforms/prfs/prf.h @@ -23,7 +23,7 @@ #ifndef PRF_H_ #define PRF_H_ -#include "../../payloads/transform_substructure.h" +#include <payloads/transform_substructure.h> /** diff --git a/Source/charon/transforms/prfs/prf_hmac.c b/Source/charon/transforms/prfs/prf_hmac.c index b16554eb1..9668e1b41 100644 --- a/Source/charon/transforms/prfs/prf_hmac.c +++ b/Source/charon/transforms/prfs/prf_hmac.c @@ -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; diff --git a/Source/charon/transforms/prfs/prf_hmac.h b/Source/charon/transforms/prfs/prf_hmac.h index 3f5a86678..22e993bee 100644 --- a/Source/charon/transforms/prfs/prf_hmac.h +++ b/Source/charon/transforms/prfs/prf_hmac.h @@ -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 diff --git a/Source/charon/transforms/signers/signer.h b/Source/charon/transforms/signers/signer.h index e1fa7b4c6..3dbc72f88 100644 --- a/Source/charon/transforms/signers/signer.h +++ b/Source/charon/transforms/signers/signer.h @@ -23,7 +23,7 @@ #ifndef SIGNER_H_ #define SIGNER_H_ -#include "../../payloads/transform_substructure.h" +#include <payloads/transform_substructure.h> /** diff --git a/Source/charon/types.h b/Source/charon/types.h index 07778101e..b3021dd21 100644 --- a/Source/charon/types.h +++ b/Source/charon/types.h @@ -28,7 +28,7 @@ #include <sys/types.h> #include <stdlib.h> -#include "definitions.h" +#include <definitions.h> typedef enum status_e { SUCCESS, diff --git a/Source/charon/utils/allocator.h b/Source/charon/utils/allocator.h index 8006911e7..e3d81b349 100644 --- a/Source/charon/utils/allocator.h +++ b/Source/charon/utils/allocator.h @@ -28,7 +28,7 @@ #include <stddef.h> #include <string.h> -#include "../types.h" +#include <types.h> /** diff --git a/Source/charon/utils/gmp_helper.c b/Source/charon/utils/gmp_helper.c index c9417dae0..4e4a35c0b 100644 --- a/Source/charon/utils/gmp_helper.c +++ b/Source/charon/utils/gmp_helper.c @@ -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 diff --git a/Source/charon/utils/gmp_helper.h b/Source/charon/utils/gmp_helper.h index c1c65246e..015f7492e 100644 --- a/Source/charon/utils/gmp_helper.h +++ b/Source/charon/utils/gmp_helper.h @@ -28,7 +28,7 @@ #include <gmp.h> -#include "../types.h" +#include <types.h> /** * Class with helper functions to manipulate gmp values diff --git a/Source/charon/utils/host.c b/Source/charon/utils/host.c index 100cea688..c2b01d175 100644 --- a/Source/charon/utils/host.c +++ b/Source/charon/utils/host.c @@ -20,11 +20,9 @@ * for more details. */ - - #include "host.h" -#include "allocator.h" +#include <utils/allocator.h> /** * @brief The logger object. diff --git a/Source/charon/utils/host.h b/Source/charon/utils/host.h index 27d20d731..f592e67eb 100644 --- a/Source/charon/utils/host.h +++ b/Source/charon/utils/host.h @@ -30,7 +30,7 @@ #include <netinet/in.h> #include <arpa/inet.h> -#include "../types.h" +#include <types.h> /** * @brief The logger object diff --git a/Source/charon/utils/linked_list.c b/Source/charon/utils/linked_list.c index 910b275ca..42dcf568d 100644 --- a/Source/charon/utils/linked_list.c +++ b/Source/charon/utils/linked_list.c @@ -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; diff --git a/Source/charon/utils/linked_list.h b/Source/charon/utils/linked_list.h index 016f9b017..eaea27f7c 100644 --- a/Source/charon/utils/linked_list.h +++ b/Source/charon/utils/linked_list.h @@ -23,7 +23,7 @@ #ifndef LINKED_LIST_H_ #define LINKED_LIST_H_ -#include "../types.h" +#include <types.h> /** * @brief Iterator for a linked list diff --git a/Source/charon/utils/logger.c b/Source/charon/utils/logger.c index fd1b567ba..f06a57159 100644 --- a/Source/charon/utils/logger.c +++ b/Source/charon/utils/logger.c @@ -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) diff --git a/Source/charon/utils/logger.h b/Source/charon/utils/logger.h index 286491fb6..3c4b3456e 100644 --- a/Source/charon/utils/logger.h +++ b/Source/charon/utils/logger.h @@ -24,7 +24,8 @@ #define LOGGER_H_ #include <stdio.h> -#include "../types.h" + +#include <types.h> /** * @brief Log Levels supported by the logger object diff --git a/Source/charon/utils/logger_manager.c b/Source/charon/utils/logger_manager.c index 0601eae8a..aa2fdf2c8 100644 --- a/Source/charon/utils/logger_manager.c +++ b/Source/charon/utils/logger_manager.c @@ -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"}, diff --git a/Source/charon/utils/logger_manager.h b/Source/charon/utils/logger_manager.h index 04fca23a8..1553963e6 100644 --- a/Source/charon/utils/logger_manager.h +++ b/Source/charon/utils/logger_manager.h @@ -25,7 +25,7 @@ #include <pthread.h> -#include "logger.h" +#include <utils/logger.h> /** * @brief Context of a specific logger diff --git a/Source/charon/utils/randomizer.c b/Source/charon/utils/randomizer.c index 9af7d5257..e59eeda91 100644 --- a/Source/charon/utils/randomizer.c +++ b/Source/charon/utils/randomizer.c @@ -28,7 +28,7 @@ #include "randomizer.h" -#include "allocator.h" +#include <utils/allocator.h> /** * Default random device used when no device is given. diff --git a/Source/charon/utils/randomizer.h b/Source/charon/utils/randomizer.h index 0d3757233..4531f03cc 100644 --- a/Source/charon/utils/randomizer.h +++ b/Source/charon/utils/randomizer.h @@ -23,7 +23,7 @@ #ifndef RANDOMIZER_H_ #define RANDOMIZER_H_ -#include "../types.h" +#include <types.h> /** * Object representing an randomizer diff --git a/Source/charon/utils/tester.c b/Source/charon/utils/tester.c index f2019c249..074224076 100644 --- a/Source/charon/utils/tester.c +++ b/Source/charon/utils/tester.c @@ -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 diff --git a/Source/charon/utils/tester.h b/Source/charon/utils/tester.h index 69b7de002..0ecd8ba54 100644 --- a/Source/charon/utils/tester.h +++ b/Source/charon/utils/tester.h @@ -25,7 +25,7 @@ #include <stdio.h> -#include "../types.h" +#include <types.h> |