diff options
Diffstat (limited to 'Source')
64 files changed, 112 insertions, 95 deletions
diff --git a/Source/charon/configuration.c b/Source/charon/configuration.c index ae57b5c58..8c960ebe9 100644 --- a/Source/charon/configuration.c +++ b/Source/charon/configuration.c @@ -24,10 +24,11 @@ #include <stdlib.h> -#include "allocator.h" -#include "types.h" #include "configuration.h" +#include "types.h" +#include "utils/allocator.h" + /** * Private data of an configuration_t object */ diff --git a/Source/charon/encodings.c b/Source/charon/encodings/encodings.c index 7ac3bfd5b..5f2c62f64 100644 --- a/Source/charon/encodings.c +++ b/Source/charon/encodings/encodings.c @@ -28,9 +28,9 @@ #include <stdlib.h> -#include "types.h" +#include "../types.h" #include "encodings.h" -#include "encodings/ike_header.h" +#include "ike_header.h" extern payload_info_t ike_header_info; diff --git a/Source/charon/encodings.h b/Source/charon/encodings/encodings.h index 356a73d5f..14fb73ff6 100644 --- a/Source/charon/encodings.h +++ b/Source/charon/encodings/encodings.h @@ -29,8 +29,8 @@ #ifndef ENCODINGS_H_ #define ENCODINGS_H_ -#include "types.h" -#include "definitions.h" +#include "../types.h" +#include "../definitions.h" /** diff --git a/Source/charon/encodings/ike_header.c b/Source/charon/encodings/ike_header.c index df0613953..8647f7a45 100644 --- a/Source/charon/encodings/ike_header.c +++ b/Source/charon/encodings/ike_header.c @@ -24,7 +24,7 @@ /* offsetof macro */ #include <stddef.h> - #include "../encodings.h" + #include "sencodings.h" #include "ike_header.h" /** diff --git a/Source/charon/encodings/ike_header.h b/Source/charon/encodings/ike_header.h index 22978a756..6ca431a70 100644 --- a/Source/charon/encodings/ike_header.h +++ b/Source/charon/encodings/ike_header.h @@ -25,6 +25,7 @@ #ifndef IKE_HEADER_H_ #define IKE_HEADER_H_ +#include "../types.h" /** * Data structure to hold the data of an IKEv2-Header diff --git a/Source/charon/generator.c b/Source/charon/generator.c index 4c28173ce..bfe3dde30 100644 --- a/Source/charon/generator.c +++ b/Source/charon/generator.c @@ -25,10 +25,12 @@ #include <arpa/inet.h> #include <stdio.h> -#include "allocator.h" -#include "types.h" + #include "generator.h" +#include "types.h" +#include "utils/allocator.h" + typedef struct private_generator_context_s private_generator_context_t; diff --git a/Source/charon/generator.h b/Source/charon/generator.h index cf643fc5f..fc307de7e 100644 --- a/Source/charon/generator.h +++ b/Source/charon/generator.h @@ -24,7 +24,7 @@ #define GENERATOR_H_ #include "types.h" -#include "encodings.h" +#include "encodings/encodings.h" /** * Generating is done in a data buffer. diff --git a/Source/charon/globals.h b/Source/charon/globals.h index d69027794..e7ec4e932 100644 --- a/Source/charon/globals.h +++ b/Source/charon/globals.h @@ -23,11 +23,11 @@ #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 "socket.h" -#include "logger_manager.h" +#include "utils/logger_manager.h" extern send_queue_t *global_send_queue; diff --git a/Source/charon/ike_sa.c b/Source/charon/ike_sa.c index 5afbce965..b0aa70971 100644 --- a/Source/charon/ike_sa.c +++ b/Source/charon/ike_sa.c @@ -21,10 +21,11 @@ * for more details. */ -#include "allocator.h" +#include "ike_sa.h" + #include "types.h" +#include "utils/allocator.h" #include "utils/linked_list.h" -#include "ike_sa.h" /** diff --git a/Source/charon/ike_sa_id.c b/Source/charon/ike_sa_id.c index e5910e739..9f83ed5ce 100644 --- a/Source/charon/ike_sa_id.c +++ b/Source/charon/ike_sa_id.c @@ -23,10 +23,11 @@ #include <stdlib.h> #include <string.h> -#include "allocator.h" -#include "types.h" #include "ike_sa_id.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 0012cea9b..f296ceccd 100644 --- a/Source/charon/ike_sa_manager.c +++ b/Source/charon/ike_sa_manager.c @@ -23,10 +23,11 @@ #include <pthread.h> #include <string.h> -#include "allocator.h" #include "ike_sa_manager.h" -#include "utils/linked_list.h" + #include "ike_sa_id.h" +#include "utils/allocator.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/job.c b/Source/charon/job.c index 557961df2..9740de3c6 100644 --- a/Source/charon/job.c +++ b/Source/charon/job.c @@ -22,8 +22,9 @@ #include <stdlib.h> -#include "allocator.h" - #include "job.h" +#include "job.h" + +#include "utils/allocator.h" /** * @brief implements function destroy of job_t diff --git a/Source/charon/message.c b/Source/charon/message.c index f6aa1fa6d..46a8e9122 100644 --- a/Source/charon/message.c +++ b/Source/charon/message.c @@ -24,11 +24,11 @@ #include "message.h" -#include "allocator.h" #include "types.h" #include "ike_sa_id.h" #include "utils/linked_list.h" -#include "encodings.h" +#include "utils/allocator.h" +#include "encodings/encodings.h" /** * Entry for a payload in the internal used linked list diff --git a/Source/charon/packet.c b/Source/charon/packet.c index ba2c0cb58..5587daa77 100644 --- a/Source/charon/packet.c +++ b/Source/charon/packet.c @@ -20,9 +20,11 @@ * for more details. */ -#include "allocator.h" + #include "packet.h" +#include "utils/allocator.h" + /** * Private data of an packet_t object diff --git a/Source/charon/parser.c b/Source/charon/parser.c index 35c9dd785..b1f0c069b 100644 --- a/Source/charon/parser.c +++ b/Source/charon/parser.c @@ -23,12 +23,13 @@ #include <stdlib.h> #include <arpa/inet.h> -#include "allocator.h" +#include "parser.h" + +#include "types.h" #include "definitions.h" #include "globals.h" -#include "types.h" -#include "parser.h" -#include "logger.h" +#include "utils/allocator.h" +#include "utils/logger.h" /** * @private data stored in a context diff --git a/Source/charon/parser.h b/Source/charon/parser.h index 8a13f9984..ebd456134 100644 --- a/Source/charon/parser.h +++ b/Source/charon/parser.h @@ -24,7 +24,7 @@ #define PARSER_H_ #include "types.h" -#include "encodings.h" +#include "encodings/encodings.h" /** * @brief The parser context stores state information for a parsing session. diff --git a/Source/charon/queues/event_queue.c b/Source/charon/queues/event_queue.c index 7b0843a6c..811f2e700 100644 --- a/Source/charon/queues/event_queue.c +++ b/Source/charon/queues/event_queue.c @@ -25,8 +25,8 @@ #include "event_queue.h" -#include "../allocator.h" #include "../types.h" +#include "../utils/allocator.h" #include "../utils/linked_list.h" diff --git a/Source/charon/queues/job_queue.c b/Source/charon/queues/job_queue.c index 46423a961..b56252278 100644 --- a/Source/charon/queues/job_queue.c +++ b/Source/charon/queues/job_queue.c @@ -25,7 +25,7 @@ #include "job_queue.h" -#include "../allocator.h" +#include "../utils/allocator.h" #include "../utils/linked_list.h" /** diff --git a/Source/charon/queues/send_queue.c b/Source/charon/queues/send_queue.c index 1b416f731..4f31ec7e9 100644 --- a/Source/charon/queues/send_queue.c +++ b/Source/charon/queues/send_queue.c @@ -24,7 +24,7 @@ #include "send_queue.h" -#include "../allocator.h" +#include "../utils/allocator.h" #include "../utils/linked_list.h" /** diff --git a/Source/charon/receiver.c b/Source/charon/receiver.c index e3f60d700..df618a366 100644 --- a/Source/charon/receiver.c +++ b/Source/charon/receiver.c @@ -25,12 +25,12 @@ #include "receiver.h" -#include "allocator.h" #include "socket.h" #include "packet.h" #include "job.h" #include "queues/job_queue.h" #include "globals.h" +#include "utils/allocator.h" /** * Private data of a receiver object diff --git a/Source/charon/scheduler.c b/Source/charon/scheduler.c index e8ea4d456..9a32d0c80 100644 --- a/Source/charon/scheduler.c +++ b/Source/charon/scheduler.c @@ -25,9 +25,9 @@ #include "scheduler.h" -#include "allocator.h" -#include "queues/job_queue.h" #include "globals.h" +#include "utils/allocator.h" +#include "queues/job_queue.h" /** * Private data of a scheduler object diff --git a/Source/charon/sender.c b/Source/charon/sender.c index cbef73e60..3e4ca99e0 100644 --- a/Source/charon/sender.c +++ b/Source/charon/sender.c @@ -25,11 +25,11 @@ #include "sender.h" -#include "allocator.h" #include "socket.h" #include "packet.h" -#include "queues/send_queue.h" #include "globals.h" +#include "queues/send_queue.h" +#include "utils/allocator.h" /** * Private data of a sender object diff --git a/Source/charon/socket.c b/Source/charon/socket.c index e650cd83d..89a6c11a6 100644 --- a/Source/charon/socket.c +++ b/Source/charon/socket.c @@ -29,9 +29,10 @@ #include <unistd.h> #include <stdlib.h> -#include "allocator.h" #include "socket.h" +#include "utils/allocator.h" + typedef struct private_socket_s private_socket_t; struct private_socket_s{ diff --git a/Source/charon/testcases/event_queue_test.c b/Source/charon/testcases/event_queue_test.c index 05ff372e2..35638cd77 100644 --- a/Source/charon/testcases/event_queue_test.c +++ b/Source/charon/testcases/event_queue_test.c @@ -23,9 +23,9 @@ #include <stdlib.h> #include <pthread.h> -#include "../allocator.h" #include "event_queue_test.h" -#include "../tester.h" + +#include "../utils/allocator.h" #include "../queues/event_queue.h" /** diff --git a/Source/charon/testcases/event_queue_test.h b/Source/charon/testcases/event_queue_test.h index 87367f120..4ac099b43 100644 --- a/Source/charon/testcases/event_queue_test.h +++ b/Source/charon/testcases/event_queue_test.h @@ -23,7 +23,7 @@ #ifndef EVENT_QUEUE_TEST_H_ #define EVENT_QUEUE_TEST_H_ -#include "../tester.h" +#include "../utils/tester.h" /** * @brief Test function used to test the event_queue functionality diff --git a/Source/charon/testcases/generator_test.c b/Source/charon/testcases/generator_test.c index 98903c9d0..cabe55181 100644 --- a/Source/charon/testcases/generator_test.c +++ b/Source/charon/testcases/generator_test.c @@ -22,14 +22,14 @@ #include <string.h> -#include "../globals.h" -#include "../allocator.h" -#include "../logger_manager.h" #include "generator_test.h" -#include "../tester.h" -#include "../logger.h" -#include "../encodings.h" + +#include "../globals.h" #include "../generator.h" +#include "../utils/allocator.h" +#include "../utils/logger_manager.h" +#include "../utils/logger.h" +#include "../encodings/encodings.h" #include "../encodings/ike_header.h" extern payload_info_t *payload_infos[]; diff --git a/Source/charon/testcases/generator_test.h b/Source/charon/testcases/generator_test.h index 38f01296d..43d3575d3 100644 --- a/Source/charon/testcases/generator_test.h +++ b/Source/charon/testcases/generator_test.h @@ -23,7 +23,7 @@ #ifndef GENERATOR_TEST_H_ #define GENERATOR_TEST_H_ -#include "../tester.h" +#include "../utils/tester.h" /** * @brief Test function used to test the generator with unsupported payload diff --git a/Source/charon/testcases/ike_sa_id_test.c b/Source/charon/testcases/ike_sa_id_test.c index 997d4e997..55832265e 100644 --- a/Source/charon/testcases/ike_sa_id_test.c +++ b/Source/charon/testcases/ike_sa_id_test.c @@ -21,7 +21,7 @@ */ #include "ike_sa_id_test.h" -#include "../tester.h" + #include "../ike_sa_id.h" /* diff --git a/Source/charon/testcases/ike_sa_id_test.h b/Source/charon/testcases/ike_sa_id_test.h index 3f2820cbf..157fab038 100644 --- a/Source/charon/testcases/ike_sa_id_test.h +++ b/Source/charon/testcases/ike_sa_id_test.h @@ -23,7 +23,7 @@ #ifndef IKE_SA_ID_TEST_H_ #define IKE_SA_ID_TEST_H_ -#include "../tester.h" +#include "../utils/tester.h" /** * @brief Test function used to test the ike_sa_id functionality diff --git a/Source/charon/testcases/ike_sa_manager_test.c b/Source/charon/testcases/ike_sa_manager_test.c index a2c4873c3..f2f8c97f0 100644 --- a/Source/charon/testcases/ike_sa_manager_test.c +++ b/Source/charon/testcases/ike_sa_manager_test.c @@ -25,8 +25,8 @@ #include <unistd.h> #include "ike_sa_manager_test.h" + #include "../types.h" -#include "../tester.h" #include "../ike_sa_manager.h" diff --git a/Source/charon/testcases/ike_sa_manager_test.h b/Source/charon/testcases/ike_sa_manager_test.h index c449445cc..416bb81f3 100644 --- a/Source/charon/testcases/ike_sa_manager_test.h +++ b/Source/charon/testcases/ike_sa_manager_test.h @@ -23,7 +23,7 @@ #ifndef IKE_SA_MANAGER_TEST_H_ #define IKE_SA_MANAGER_TEST_H_ -#include "../tester.h" +#include "../utils/tester.h" /** * @brief Test function used to test the ike_sa_manager_t functionality diff --git a/Source/charon/testcases/ike_sa_test.c b/Source/charon/testcases/ike_sa_test.c index 894eafac9..e052fd632 100644 --- a/Source/charon/testcases/ike_sa_test.c +++ b/Source/charon/testcases/ike_sa_test.c @@ -21,8 +21,8 @@ */ #include "ike_sa_test.h" + #include "../types.h" -#include "../tester.h" #include "../message.h" #include "../configuration.h" #include "../ike_sa.h" diff --git a/Source/charon/testcases/ike_sa_test.h b/Source/charon/testcases/ike_sa_test.h index 4d5dff614..f6e708f8a 100644 --- a/Source/charon/testcases/ike_sa_test.h +++ b/Source/charon/testcases/ike_sa_test.h @@ -23,7 +23,7 @@ #ifndef IKE_SA_TEST_H_ #define IKE_SA_TEST_H_ -#include "../tester.h" +#include "../utils/tester.h" /** * @brief Test function used to test the ike_sa_t functionality diff --git a/Source/charon/testcases/job_queue_test.c b/Source/charon/testcases/job_queue_test.c index 5e6010f56..52f7169ce 100644 --- a/Source/charon/testcases/job_queue_test.c +++ b/Source/charon/testcases/job_queue_test.c @@ -25,9 +25,9 @@ #include <pthread.h> #include <unistd.h> -#include "../allocator.h" #include "job_queue_test.h" -#include "../tester.h" + +#include "../utils/allocator.h" #include "../queues/job_queue.h" diff --git a/Source/charon/testcases/job_queue_test.h b/Source/charon/testcases/job_queue_test.h index c6af6c26b..42c9253ce 100644 --- a/Source/charon/testcases/job_queue_test.h +++ b/Source/charon/testcases/job_queue_test.h @@ -23,7 +23,7 @@ #ifndef JOB_QUEUE_TEST_H_ #define JOB_QUEUE_TEST_H_ -#include "../tester.h" +#include "../utils/tester.h" /** * @brief Test function used to test the job_queue functionality diff --git a/Source/charon/testcases/linked_list_test.c b/Source/charon/testcases/linked_list_test.c index cf393fb78..4ab43af9b 100644 --- a/Source/charon/testcases/linked_list_test.c +++ b/Source/charon/testcases/linked_list_test.c @@ -21,8 +21,9 @@ */ #include <string.h> + +#include "linked_list_test.h" -#include "../tester.h" #include "../utils/linked_list.h" /* diff --git a/Source/charon/testcases/linked_list_test.h b/Source/charon/testcases/linked_list_test.h index 59aecdc55..3d977d7f1 100644 --- a/Source/charon/testcases/linked_list_test.h +++ b/Source/charon/testcases/linked_list_test.h @@ -23,7 +23,7 @@ #ifndef LINKED_LIST_TEST_H_ #define LINKED_LIST_TEST_H_ -#include "../tester.h" +#include "../utils/tester.h" /** * @brief Test function for the type linked_list_t diff --git a/Source/charon/testcases/packet_test.c b/Source/charon/testcases/packet_test.c index f2cb22887..4646648e6 100644 --- a/Source/charon/testcases/packet_test.c +++ b/Source/charon/testcases/packet_test.c @@ -21,9 +21,11 @@ */ #include <string.h> + #include "packet_test.h" -#include "../allocator.h" + #include "../packet.h" +#include "../utils/allocator.h" /* diff --git a/Source/charon/testcases/packet_test.h b/Source/charon/testcases/packet_test.h index 4a4eb8ffc..f667d5381 100644 --- a/Source/charon/testcases/packet_test.h +++ b/Source/charon/testcases/packet_test.h @@ -23,7 +23,7 @@ #ifndef PACKET_TEST_H_ #define PACKET_TEST_H_ -#include "../tester.h" +#include "../utils/tester.h" /** * @brief Test function used to test the packet_t functionality diff --git a/Source/charon/testcases/parser_test.c b/Source/charon/testcases/parser_test.c index 9ad77fc53..29a0111a4 100644 --- a/Source/charon/testcases/parser_test.c +++ b/Source/charon/testcases/parser_test.c @@ -21,13 +21,13 @@ #include <string.h> -#include "../allocator.h" #include "parser_test.h" -#include "../tester.h" -#include "../logger_manager.h" -#include "../encodings.h" + #include "../generator.h" #include "../parser.h" +#include "../utils/allocator.h" +#include "../utils/logger_manager.h" +#include "../encodings/encodings.h" #include "../encodings/ike_header.h" extern payload_info_t *payload_infos[]; diff --git a/Source/charon/testcases/parser_test.h b/Source/charon/testcases/parser_test.h index 055fd38f6..dc952ef87 100644 --- a/Source/charon/testcases/parser_test.h +++ b/Source/charon/testcases/parser_test.h @@ -22,7 +22,7 @@ #ifndef PARSER_TEST_H_ #define PARSER_TEST_H_ -#include "../tester.h" +#include "../utils/tester.h" void test_parser_with_header_payload(tester_t *tester); diff --git a/Source/charon/testcases/receiver_test.c b/Source/charon/testcases/receiver_test.c index d83581e5b..0a3a524ae 100644 --- a/Source/charon/testcases/receiver_test.c +++ b/Source/charon/testcases/receiver_test.c @@ -23,14 +23,16 @@ #include <string.h> #include <unistd.h> -#include "../allocator.h" -#include "sender_test.h" +#include "receiver_test.h" + #include "../globals.h" #include "../receiver.h" #include "../packet.h" #include "../socket.h" #include "../queues/send_queue.h" #include "../queues/job_queue.h" +#include "../encodings/encodings.h" +#include "../utils/allocator.h" /** * Number of packets to send by sender-thread diff --git a/Source/charon/testcases/receiver_test.h b/Source/charon/testcases/receiver_test.h index a4f0ea4c5..85c518b36 100644 --- a/Source/charon/testcases/receiver_test.h +++ b/Source/charon/testcases/receiver_test.h @@ -23,7 +23,7 @@ #ifndef RECEIVER_TEST_H_ #define RECEIVER_TEST_H_ -#include "../tester.h" +#include "../utils/tester.h" /** * @brief Test function for the type receiver_t diff --git a/Source/charon/testcases/scheduler_test.c b/Source/charon/testcases/scheduler_test.c index ba312fcc0..4186d9c62 100644 --- a/Source/charon/testcases/scheduler_test.c +++ b/Source/charon/testcases/scheduler_test.c @@ -24,6 +24,7 @@ #include <unistd.h> #include "scheduler_test.h" + #include "../globals.h" #include "../scheduler.h" #include "../queues/event_queue.h" diff --git a/Source/charon/testcases/scheduler_test.h b/Source/charon/testcases/scheduler_test.h index 6f0c1fc6d..baf7ce24d 100644 --- a/Source/charon/testcases/scheduler_test.h +++ b/Source/charon/testcases/scheduler_test.h @@ -23,7 +23,7 @@ #ifndef SCHEDULER_TEST_H_ #define SCHEDULER_TEST_H_ -#include "../tester.h" +#include "../utils/tester.h" /** * @brief Test function for the type scheduler_t diff --git a/Source/charon/testcases/send_queue_test.c b/Source/charon/testcases/send_queue_test.c index 29aac883b..00a067204 100644 --- a/Source/charon/testcases/send_queue_test.c +++ b/Source/charon/testcases/send_queue_test.c @@ -23,7 +23,7 @@ #include <pthread.h> #include "send_queue_test.h" -#include "../tester.h" + #include "../queues/send_queue.h" diff --git a/Source/charon/testcases/send_queue_test.h b/Source/charon/testcases/send_queue_test.h index 60b9306c0..81b6ff2dd 100644 --- a/Source/charon/testcases/send_queue_test.h +++ b/Source/charon/testcases/send_queue_test.h @@ -23,7 +23,7 @@ #ifndef SEND_QUEUE_TEST_H_ #define SEND_QUEUE_TEST_H_ -#include "../tester.h" +#include "../utils/tester.h" /** * @brief Test function used to test the send_queue functionality diff --git a/Source/charon/testcases/sender_test.c b/Source/charon/testcases/sender_test.c index 67ba5573c..8617686f7 100644 --- a/Source/charon/testcases/sender_test.c +++ b/Source/charon/testcases/sender_test.c @@ -22,14 +22,15 @@ #include <string.h> -#include "../allocator.h" #include "sender_test.h" + #include "../globals.h" #include "../sender.h" #include "../packet.h" #include "../socket.h" #include "../queues/send_queue.h" #include "../queues/job_queue.h" +#include "../utils/allocator.h" /** * Number of packets to send by sender-thread diff --git a/Source/charon/testcases/sender_test.h b/Source/charon/testcases/sender_test.h index 5af51613e..1ee782f72 100644 --- a/Source/charon/testcases/sender_test.h +++ b/Source/charon/testcases/sender_test.h @@ -23,7 +23,7 @@ #ifndef SENDER_TEST_H_ #define SENDER_TEST_H_ -#include "../tester.h" +#include "../utils/tester.h" /** * @brief Test function for the type sender_t diff --git a/Source/charon/testcases/socket_test.c b/Source/charon/testcases/socket_test.c index 127390394..2dfcf432e 100644 --- a/Source/charon/testcases/socket_test.c +++ b/Source/charon/testcases/socket_test.c @@ -23,10 +23,10 @@ #include <stdlib.h> #include <string.h> -#include "../allocator.h" #include "socket_test.h" -#include "../tester.h" + #include "../socket.h" +#include "../utils/allocator.h" /* * Description in header file diff --git a/Source/charon/testcases/socket_test.h b/Source/charon/testcases/socket_test.h index f3ae83714..2911f104d 100644 --- a/Source/charon/testcases/socket_test.h +++ b/Source/charon/testcases/socket_test.h @@ -23,7 +23,7 @@ #ifndef SOCKET_TEST_H_ #define SOCKET_TEST_H_ -#include "../tester.h" +#include "../utils/tester.h" /** * @brief Test function for the type socket_t diff --git a/Source/charon/testcases/testcases.c b/Source/charon/testcases/testcases.c index eb3990fda..a2e12da36 100644 --- a/Source/charon/testcases/testcases.c +++ b/Source/charon/testcases/testcases.c @@ -23,13 +23,13 @@ #include <stdio.h> -#include "../logger_manager.h" -#include "../allocator.h" -#include "../tester.h" #include "../queues/job_queue.h" #include "../queues/event_queue.h" #include "../queues/send_queue.h" #include "../socket.h" +#include "../utils/logger_manager.h" +#include "../utils/allocator.h" +#include "../utils/tester.h" #include "linked_list_test.h" #include "thread_pool_test.h" #include "job_queue_test.h" diff --git a/Source/charon/testcases/thread_pool_test.c b/Source/charon/testcases/thread_pool_test.c index d54a79e79..e0c0e24a2 100644 --- a/Source/charon/testcases/thread_pool_test.c +++ b/Source/charon/testcases/thread_pool_test.c @@ -23,7 +23,7 @@ #include <stdlib.h> #include "thread_pool_test.h" -#include "../tester.h" + #include "../thread_pool.h" /* diff --git a/Source/charon/testcases/thread_pool_test.h b/Source/charon/testcases/thread_pool_test.h index 9639fc062..a05146a8b 100644 --- a/Source/charon/testcases/thread_pool_test.h +++ b/Source/charon/testcases/thread_pool_test.h @@ -23,7 +23,7 @@ #ifndef THREAD_POOL_TEST_H_ #define THREAD_POOL_TEST_H_ -#include "../tester.h" +#include "../utils/tester.h" /** * @brief Test function for the type thread_pool_t diff --git a/Source/charon/thread_pool.c b/Source/charon/thread_pool.c index 322e336fb..c4bd5479a 100644 --- a/Source/charon/thread_pool.c +++ b/Source/charon/thread_pool.c @@ -27,10 +27,10 @@ #include "thread_pool.h" -#include "allocator.h" -#include "logger.h" -#include "queues/job_queue.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/allocator.c b/Source/charon/utils/allocator.c index 26b3e5dd5..290b1de3b 100644 --- a/Source/charon/allocator.c +++ b/Source/charon/utils/allocator.c @@ -29,7 +29,6 @@ #include <stdio.h> #include "allocator.h" -#include "types.h" #ifdef LEAK_DETECTIVE diff --git a/Source/charon/allocator.h b/Source/charon/utils/allocator.h index 6ff1d2365..ab8f59bfd 100644 --- a/Source/charon/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/linked_list.c b/Source/charon/utils/linked_list.c index b842886c0..785377ee9 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 "allocator.h" typedef struct linked_list_element_s linked_list_element_t; diff --git a/Source/charon/logger.c b/Source/charon/utils/logger.c index eee03b7fc..714f8b95e 100644 --- a/Source/charon/logger.c +++ b/Source/charon/utils/logger.c @@ -27,8 +27,8 @@ #include <time.h> #include "logger.h" -#include "daemon.h" -#include "types.h" + +#include "../daemon.h" #include "allocator.h" /** diff --git a/Source/charon/logger.h b/Source/charon/utils/logger.h index 457ab056c..db6d25d60 100644 --- a/Source/charon/logger.h +++ b/Source/charon/utils/logger.h @@ -24,7 +24,7 @@ #define LOGGER_H_ #include <stdio.h> -#include "types.h" +#include "../types.h" /** * Log Levels supported by the logger object diff --git a/Source/charon/logger_manager.c b/Source/charon/utils/logger_manager.c index 9cf1ed48f..22c1059f0 100644 --- a/Source/charon/logger_manager.c +++ b/Source/charon/utils/logger_manager.c @@ -24,7 +24,7 @@ #include "logger_manager.h" #include "allocator.h" -#include "utils/linked_list.h" +#include "linked_list.h" /** * Maximum length of a logger name diff --git a/Source/charon/logger_manager.h b/Source/charon/utils/logger_manager.h index 4a2707732..4a2707732 100644 --- a/Source/charon/logger_manager.h +++ b/Source/charon/utils/logger_manager.h diff --git a/Source/charon/tester.c b/Source/charon/utils/tester.c index b3bf3f069..ce2c7fff1 100644 --- a/Source/charon/tester.c +++ b/Source/charon/utils/tester.c @@ -29,9 +29,8 @@ #include "tester.h" #include "allocator.h" -#include "utils/linked_list.h" -#include "thread_pool.h" -#include "queues/job_queue.h" +#include "linked_list.h" +#include "../queues/job_queue.h" /** * @brief Private Variables and Functions of tester class diff --git a/Source/charon/tester.h b/Source/charon/utils/tester.h index 56bd36649..69b7de002 100644 --- a/Source/charon/tester.h +++ b/Source/charon/utils/tester.h @@ -25,7 +25,7 @@ #include <stdio.h> -#include "types.h" +#include "../types.h" |