- moved queues into subfolder queues

- created subdirectory utils for linked_list_t and co.

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"
 

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"
 
 

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"
 
 /**

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

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"
 
 /**

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"
 
 
 

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.

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

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

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

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

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"
 
 /**

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"
 
 /**

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"
 
 /**

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

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;

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

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

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"
 
 
 /**

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"
 
 
 /**

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

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 */

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

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"
 
 /**

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;
 

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