- global objects are defined in globals

Source/charon/globals.h

@@ -0,0 +1,37 @@
+/**
+ * @file globals.h
+ * 
+ * @brief Global used objects
+ * 
+ */
+
+/*
+ * Copyright (C) 2005 Jan Hutter, Martin Willi
+ * Hochschule fuer Technik Rapperswil
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */
+
+#ifndef GLOBALS_H_
+#define GLOBALS_H_
+
+#include "send_queue.h"
+#include "job_queue.h"
+#include "event_queue.h"
+#include "socket.h"
+
+
+extern send_queue_t *global_send_queue;
+extern job_queue_t *global_job_queue;
+extern event_queue_t *global_event_queue;
+extern socket_t *global_socket;
+
+#endif /*GLOBALS_H_*/

Source/charon/sender.c

@@ -1,5 +1,5 @@
 /**
- * @file sender.d
+ * @file sender.c
  * 
  * @brief Implements the Sender Thread encapsulated in the sender_t-object
  * 
@@ -30,9 +30,7 @@
 #include "socket.h"
 #include "packet.h"
 #include "send_queue.h"
- 
+#include "globals.h"
-extern send_queue_t *global_send_queue;
-extern socket_t *global_socket;
  
 /**
  * Private data of a sender object

Source/charon/thread_pool.c

@@ -20,20 +20,15 @@
  * for more details.
  */
  
- 
-#include "thread_pool.h"
-
-#include "job_queue.h"
-
 #include <stdlib.h>
 #include <freeswan.h>
 #include <pluto/constants.h>
 #include <pluto/defs.h>
-
 #include <pthread.h>
  
-extern job_queue_t *global_job_queue;
+#include "thread_pool.h"
-
+#include "job_queue.h"
+#include "globals.h"
 
 /**
  * structure with private members for thread_pool