diff options
Diffstat (limited to 'Source/charon')
26 files changed, 80 insertions, 68 deletions
diff --git a/Source/charon/globals.h b/Source/charon/globals.h index 50742b233..d69027794 100644 --- a/Source/charon/globals.h +++ b/Source/charon/globals.h @@ -23,9 +23,9 @@ #ifndef GLOBALS_H_ #define GLOBALS_H_ -#include "send_queue.h" -#include "job_queue.h" -#include "event_queue.h" +#include "queues/send_queue.h" +#include "queues/job_queue.h" +#include "queues/event_queue.h" #include "socket.h" #include "logger_manager.h" diff --git a/Source/charon/ike_sa.c b/Source/charon/ike_sa.c index df7718528..5afbce965 100644 --- a/Source/charon/ike_sa.c +++ b/Source/charon/ike_sa.c @@ -23,7 +23,7 @@ #include "allocator.h" #include "types.h" -#include "linked_list.h" +#include "utils/linked_list.h" #include "ike_sa.h" diff --git a/Source/charon/ike_sa_manager.c b/Source/charon/ike_sa_manager.c index 5bb9035ec..0012cea9b 100644 --- a/Source/charon/ike_sa_manager.c +++ b/Source/charon/ike_sa_manager.c @@ -25,7 +25,7 @@ #include "allocator.h" #include "ike_sa_manager.h" -#include "linked_list.h" +#include "utils/linked_list.h" #include "ike_sa_id.h" /** diff --git a/Source/charon/logger_manager.c b/Source/charon/logger_manager.c index 37fd14696..9cf1ed48f 100644 --- a/Source/charon/logger_manager.c +++ b/Source/charon/logger_manager.c @@ -20,9 +20,11 @@ * for more details. */ -#include "allocator.h" + #include "logger_manager.h" -#include "linked_list.h" + +#include "allocator.h" +#include "utils/linked_list.h" /** * Maximum length of a logger name diff --git a/Source/charon/message.c b/Source/charon/message.c index 26832296a..f6aa1fa6d 100644 --- a/Source/charon/message.c +++ b/Source/charon/message.c @@ -22,11 +22,12 @@ #include <stdlib.h> +#include "message.h" + #include "allocator.h" #include "types.h" -#include "message.h" #include "ike_sa_id.h" -#include "linked_list.h" +#include "utils/linked_list.h" #include "encodings.h" /** diff --git a/Source/charon/event_queue.c b/Source/charon/queues/event_queue.c index a6c1197c8..7b0843a6c 100644 --- a/Source/charon/event_queue.c +++ b/Source/charon/queues/event_queue.c @@ -23,10 +23,11 @@ #include <pthread.h> #include <stdlib.h> -#include "allocator.h" -#include "types.h" #include "event_queue.h" -#include "linked_list.h" + +#include "../allocator.h" +#include "../types.h" +#include "../utils/linked_list.h" diff --git a/Source/charon/event_queue.h b/Source/charon/queues/event_queue.h index 0fd653895..52e4c8153 100644 --- a/Source/charon/event_queue.h +++ b/Source/charon/queues/event_queue.h @@ -25,8 +25,8 @@ #include <sys/time.h> -#include "types.h" -#include "job.h" +#include "../types.h" +#include "../job.h" /** * @brief Event-Queue used to store timed events. diff --git a/Source/charon/job_queue.c b/Source/charon/queues/job_queue.c index d14289bb0..46423a961 100644 --- a/Source/charon/job_queue.c +++ b/Source/charon/queues/job_queue.c @@ -23,9 +23,10 @@ #include <stdlib.h> #include <pthread.h> -#include "allocator.h" #include "job_queue.h" -#include "linked_list.h" + +#include "../allocator.h" +#include "../utils/linked_list.h" /** * @brief Private Variables and Functions of job_queue class diff --git a/Source/charon/job_queue.h b/Source/charon/queues/job_queue.h index 62f9283de..c7ceacae3 100644 --- a/Source/charon/job_queue.h +++ b/Source/charon/queues/job_queue.h @@ -23,8 +23,8 @@ #ifndef JOB_QUEUE_H_ #define JOB_QUEUE_H_ -#include "types.h" -#include "job.h" +#include "../types.h" +#include "../job.h" /** * @brief Job-Queue diff --git a/Source/charon/send_queue.c b/Source/charon/queues/send_queue.c index 83716927c..1b416f731 100644 --- a/Source/charon/send_queue.c +++ b/Source/charon/queues/send_queue.c @@ -22,9 +22,10 @@ #include <pthread.h> -#include "allocator.h" - #include "send_queue.h" - #include "linked_list.h" +#include "send_queue.h" + +#include "../allocator.h" +#include "../utils/linked_list.h" /** * @brief Private Variables and Functions of send_queue class diff --git a/Source/charon/send_queue.h b/Source/charon/queues/send_queue.h index 5524c7870..072d2f966 100644 --- a/Source/charon/send_queue.h +++ b/Source/charon/queues/send_queue.h @@ -23,8 +23,8 @@ #ifndef SEND_QUEUE_H_ #define SEND_QUEUE_H_ -#include "types.h" -#include "packet.h" +#include "../types.h" +#include "../packet.h" /** * @brief Send-Queue diff --git a/Source/charon/receiver.c b/Source/charon/receiver.c index bed695782..e3f60d700 100644 --- a/Source/charon/receiver.c +++ b/Source/charon/receiver.c @@ -23,12 +23,13 @@ #include <stdlib.h> #include <pthread.h> -#include "allocator.h" #include "receiver.h" + +#include "allocator.h" #include "socket.h" #include "packet.h" #include "job.h" -#include "job_queue.h" +#include "queues/job_queue.h" #include "globals.h" /** diff --git a/Source/charon/scheduler.c b/Source/charon/scheduler.c index 7947c34a2..e8ea4d456 100644 --- a/Source/charon/scheduler.c +++ b/Source/charon/scheduler.c @@ -23,9 +23,10 @@ #include <stdlib.h> #include <pthread.h> -#include "allocator.h" #include "scheduler.h" -#include "job_queue.h" + +#include "allocator.h" +#include "queues/job_queue.h" #include "globals.h" /** diff --git a/Source/charon/sender.c b/Source/charon/sender.c index d72f7b122..cbef73e60 100644 --- a/Source/charon/sender.c +++ b/Source/charon/sender.c @@ -23,11 +23,12 @@ #include <stdlib.h> #include <pthread.h> -#include "allocator.h" #include "sender.h" + +#include "allocator.h" #include "socket.h" #include "packet.h" -#include "send_queue.h" +#include "queues/send_queue.h" #include "globals.h" /** diff --git a/Source/charon/testcases/event_queue_test.c b/Source/charon/testcases/event_queue_test.c index 35e244347..05ff372e2 100644 --- a/Source/charon/testcases/event_queue_test.c +++ b/Source/charon/testcases/event_queue_test.c @@ -26,7 +26,7 @@ #include "../allocator.h" #include "event_queue_test.h" #include "../tester.h" -#include "../event_queue.h" +#include "../queues/event_queue.h" /** * Number of different times to insert per thread diff --git a/Source/charon/testcases/job_queue_test.c b/Source/charon/testcases/job_queue_test.c index 63fbb458f..5e6010f56 100644 --- a/Source/charon/testcases/job_queue_test.c +++ b/Source/charon/testcases/job_queue_test.c @@ -28,7 +28,7 @@ #include "../allocator.h" #include "job_queue_test.h" #include "../tester.h" -#include "../job_queue.h" +#include "../queues/job_queue.h" typedef struct job_queue_test_s job_queue_test_t; diff --git a/Source/charon/testcases/linked_list_test.c b/Source/charon/testcases/linked_list_test.c index bba2054c6..cf393fb78 100644 --- a/Source/charon/testcases/linked_list_test.c +++ b/Source/charon/testcases/linked_list_test.c @@ -23,7 +23,7 @@ #include <string.h> #include "../tester.h" -#include "../linked_list.h" +#include "../utils/linked_list.h" /* * Description in header-file diff --git a/Source/charon/testcases/receiver_test.c b/Source/charon/testcases/receiver_test.c index 2c3556d16..d83581e5b 100644 --- a/Source/charon/testcases/receiver_test.c +++ b/Source/charon/testcases/receiver_test.c @@ -29,8 +29,8 @@ #include "../receiver.h" #include "../packet.h" #include "../socket.h" -#include "../send_queue.h" -#include "../job_queue.h" +#include "../queues/send_queue.h" +#include "../queues/job_queue.h" /** * Number of packets to send by sender-thread diff --git a/Source/charon/testcases/scheduler_test.c b/Source/charon/testcases/scheduler_test.c index a67a44603..ba312fcc0 100644 --- a/Source/charon/testcases/scheduler_test.c +++ b/Source/charon/testcases/scheduler_test.c @@ -26,8 +26,8 @@ #include "scheduler_test.h" #include "../globals.h" #include "../scheduler.h" -#include "../event_queue.h" -#include "../job_queue.h" +#include "../queues/event_queue.h" +#include "../queues/job_queue.h" /** diff --git a/Source/charon/testcases/send_queue_test.c b/Source/charon/testcases/send_queue_test.c index 3096a3e23..29aac883b 100644 --- a/Source/charon/testcases/send_queue_test.c +++ b/Source/charon/testcases/send_queue_test.c @@ -24,7 +24,7 @@ #include "send_queue_test.h" #include "../tester.h" -#include "../send_queue.h" +#include "../queues/send_queue.h" /** diff --git a/Source/charon/testcases/sender_test.c b/Source/charon/testcases/sender_test.c index 56a5d9c31..67ba5573c 100644 --- a/Source/charon/testcases/sender_test.c +++ b/Source/charon/testcases/sender_test.c @@ -28,8 +28,8 @@ #include "../sender.h" #include "../packet.h" #include "../socket.h" -#include "../send_queue.h" -#include "../job_queue.h" +#include "../queues/send_queue.h" +#include "../queues/job_queue.h" /** * Number of packets to send by sender-thread diff --git a/Source/charon/tests.c b/Source/charon/testcases/testcases.c index ba6ccf8c0..eb3990fda 100644 --- a/Source/charon/tests.c +++ b/Source/charon/testcases/testcases.c @@ -23,28 +23,28 @@ #include <stdio.h> -#include "logger_manager.h" -#include "allocator.h" -#include "tester.h" -#include "job_queue.h" -#include "event_queue.h" -#include "send_queue.h" -#include "socket.h" -#include "testcases/linked_list_test.h" -#include "testcases/thread_pool_test.h" -#include "testcases/job_queue_test.h" -#include "testcases/event_queue_test.h" -#include "testcases/send_queue_test.h" -#include "testcases/socket_test.h" -#include "testcases/sender_test.h" -#include "testcases/scheduler_test.h" -#include "testcases/receiver_test.h" -#include "testcases/ike_sa_id_test.h" -#include "testcases/ike_sa_test.h" -#include "testcases/ike_sa_manager_test.h" -#include "testcases/generator_test.h" -#include "testcases/parser_test.h" -#include "testcases/packet_test.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 "linked_list_test.h" +#include "thread_pool_test.h" +#include "job_queue_test.h" +#include "event_queue_test.h" +#include "send_queue_test.h" +#include "socket_test.h" +#include "sender_test.h" +#include "scheduler_test.h" +#include "receiver_test.h" +#include "ike_sa_id_test.h" +#include "ike_sa_test.h" +#include "ike_sa_manager_test.h" +#include "generator_test.h" +#include "parser_test.h" +#include "packet_test.h" /* output for test messages */ diff --git a/Source/charon/tester.c b/Source/charon/tester.c index 938ca46bd..b3bf3f069 100644 --- a/Source/charon/tester.c +++ b/Source/charon/tester.c @@ -26,11 +26,12 @@ #include <pthread.h> #include <sys/time.h> -#include "allocator.h" #include "tester.h" -#include "linked_list.h" + +#include "allocator.h" +#include "utils/linked_list.h" #include "thread_pool.h" -#include "job_queue.h" +#include "queues/job_queue.h" /** * @brief Private Variables and Functions of tester class diff --git a/Source/charon/thread_pool.c b/Source/charon/thread_pool.c index c73317abd..322e336fb 100644 --- a/Source/charon/thread_pool.c +++ b/Source/charon/thread_pool.c @@ -24,11 +24,12 @@ #include <pthread.h> #include <string.h> #include <errno.h> + +#include "thread_pool.h" #include "allocator.h" #include "logger.h" -#include "thread_pool.h" -#include "job_queue.h" +#include "queues/job_queue.h" #include "globals.h" /** diff --git a/Source/charon/linked_list.c b/Source/charon/utils/linked_list.c index e1a5157e6..b842886c0 100644 --- a/Source/charon/linked_list.c +++ b/Source/charon/utils/linked_list.c @@ -22,9 +22,10 @@ #include <stdlib.h> -#include "allocator.h" #include "linked_list.h" +#include "../allocator.h" + typedef struct linked_list_element_s linked_list_element_t; diff --git a/Source/charon/linked_list.h b/Source/charon/utils/linked_list.h index 2b900a469..d48ba2686 100644 --- a/Source/charon/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 |