Renamed eurephia_struct.h to eurephia_context.h

Since this include file now only consists of eurephiaCTX definition,
it was moved to the common/ directory and renamed.

Moved the SESSION_* definitions out of this file and into
plugin/eurephiadb_session.h where they belong.

Moved the Posix MQ definitions into plugin/firewall/eurephiafw_struct.h
where they belong.

eurephia_context.h is now containing only context related things.

15 files changed, 21 insertions, 23 deletions

diff --git a/plugin/eurephia_struct.h b/common/eurephia_context.h
index 75ca250..2b6c5ed 100644
--- a/plugin/eurephia_struct.h
+++ b/common/eurephia_context.h
@@ -1,4 +1,4 @@
-/* eurephia_struct.h  --  Structures and defines used by the eurephia module
+/* eurephia_context.h  --  eurephiaCTX definition
  *
  *  GPLv2 - Copyright (C) 2008  David Sommerseth <dazo@users.sourceforge.net>
  *
@@ -21,17 +21,9 @@
 
 /*** Structures used by the eurphia module  ***/
 
-#include <mqueue.h>
-#include <semaphore.h>
-
 #ifndef   	EUREPHIASTRUCT_H_
 #define   	EUREPHIASTRUCT_H_
 
-#define SESSION_NEW        1
-#define SESSION_EXISTING   2
-#define SESSION_REGISTERED 3
-#define SESSION_LOGGEDOUT  4
-
 #include "eurephiadb_struct.h"
 #include "eurephiafw_struct.h"
 
@@ -49,6 +41,4 @@ typedef struct {
         int fatal_error;
 } eurephiaCTX;
 
-
-
 #endif
diff --git a/common/eurephia_getsym.c b/common/eurephia_getsym.c
index dc85c29..31ac05e 100644
--- a/common/eurephia_getsym.c
+++ b/common/eurephia_getsym.c
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <dlfcn.h>
 
-#include "eurephia_struct.h"
+#include <eurephia_context.h>
 #include "eurephia_log.h"
 
 void *eGetSym(eurephiaCTX *ctx, void *dlh, const char *symnam)
diff --git a/common/eurephia_log.c b/common/eurephia_log.c
index 9ea6a8e..08085e2 100644
--- a/common/eurephia_log.c
+++ b/common/eurephia_log.c
@@ -24,7 +24,7 @@
 #include <time.h>
 #include <pthread.h>
 
-#include "eurephia_struct.h"
+#include <eurephia_context.h>
 #include "eurephia_log.h"
 
 const char *erp_logtypes[] = {
diff --git a/common/eurephia_log.h b/common/eurephia_log.h
index 9a2b227..1e03286 100644
--- a/common/eurephia_log.h
+++ b/common/eurephia_log.h
@@ -21,7 +21,7 @@
 #ifndef   	EUREPHIA_LOG_H_
 #define   	EUREPHIA_LOG_H_
 
-#include <eurephia_struct.h>
+#include <eurephia_context.h>
 
 #define LOG_INFO  1
 #define LOG_DEBUG 2
diff --git a/common/eurephia_values.c b/common/eurephia_values.c
index d5473f9..06dc6b4 100644
--- a/common/eurephia_values.c
+++ b/common/eurephia_values.c
@@ -22,7 +22,7 @@
 #include <string.h>
 
 #include <eurephia_nullsafe.h>
-#include <eurephia_struct.h>
+#include <eurephia_context.h>
 #include <eurephia_log.h>
 
 
diff --git a/common/eurephia_values.h b/common/eurephia_values.h
index 8a48730..420da80 100644
--- a/common/eurephia_values.h
+++ b/common/eurephia_values.h
@@ -21,7 +21,7 @@
 #ifndef   	EUREPHIA_VALUES_H_
 # define   	EUREPHIA_VALUES_H_
 
-#include <eurephia_struct.h>
+#include <eurephia_context.h>
 
 eurephiaVALUES *eGet_valuestruct(eurephiaVALUES *vls, const char *key);
 char *eGet_value(eurephiaVALUES *vls, const char *key);
diff --git a/database/eurephiadb.h b/database/eurephiadb.h
index 2e0ab29..6fd52ad 100644
--- a/database/eurephiadb.h
+++ b/database/eurephiadb.h
@@ -18,7 +18,7 @@
  *
  */
 
-#include <eurephia_struct.h>
+#include <eurephia_context.h>
 #include <eurephiadb_driver.h>
 #include <eurephiadb_session.h>
 #include <eurephia_log.h>
diff --git a/database/eurephiadb_driver.h b/database/eurephiadb_driver.h
index 95c1cfd..fdc8992 100644
--- a/database/eurephiadb_driver.h
+++ b/database/eurephiadb_driver.h
@@ -17,7 +17,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-#include <eurephia_struct.h>
+#include <eurephia_context.h>
 #include <eurephiadb_session_struct.h>
 #include <eurephia_values_struct.h>
 
diff --git a/plugin/eurephia.c b/plugin/eurephia.c
index 0326c62..26d60b3 100644
--- a/plugin/eurephia.c
+++ b/plugin/eurephia.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <getopt.h>
 
-#include <eurephia_struct.h>
+#include <eurephia_context.h>
 #include <eurephiadb.h>
 #include <eurephiadb_driver.h>
 #include <eurephiafw.h>
diff --git a/plugin/eurephiadb_session.c b/plugin/eurephiadb_session.c
index cb314ee..952e016 100644
--- a/plugin/eurephiadb_session.c
+++ b/plugin/eurephiadb_session.c
@@ -27,7 +27,7 @@
 #include <time.h>
 #include <openssl/rand.h>
 
-#include "eurephia_struct.h"
+#include <eurephia_context.h>
 #include "eurephia_nullsafe.h"
 #include "eurephia_log.h"
 #include "eurephiadb_session.h"
diff --git a/plugin/eurephiadb_session.h b/plugin/eurephiadb_session.h
index f364529..17271be 100644
--- a/plugin/eurephiadb_session.h
+++ b/plugin/eurephiadb_session.h
@@ -23,6 +23,11 @@
 
 #include <eurephiadb_session_struct.h>
 
+#define SESSION_NEW        1
+#define SESSION_EXISTING   2
+#define SESSION_REGISTERED 3
+#define SESSION_LOGGEDOUT  4
+
 #define SESSVAL_NEW      10
 #define SESSVAL_UPDATE   11
 #define SESSVAL_DELETE   12
diff --git a/plugin/firewall/eurephiafw.c b/plugin/firewall/eurephiafw.c
index 1aba1c7..f1b15a1 100644
--- a/plugin/firewall/eurephiafw.c
+++ b/plugin/firewall/eurephiafw.c
@@ -30,7 +30,7 @@
 #include <sys/wait.h>
 #include <time.h>
 
-#include "eurephia_struct.h"
+#include <eurephia_context.h>
 #include "eurephia_log.h"
 #include "eurephiafw.h"
 #include "eurephiafw_intf.h"
diff --git a/plugin/firewall/eurephiafw_helpers.c b/plugin/firewall/eurephiafw_helpers.c
index ceb6d25..29d2f06 100644
--- a/plugin/firewall/eurephiafw_helpers.c
+++ b/plugin/firewall/eurephiafw_helpers.c
@@ -28,7 +28,7 @@
 #include <semaphore.h>
 #include <mqueue.h>
 
-#include "eurephia_struct.h"
+#include <eurephia_context.h>
 #include "eurephia_log.h"
 #include "eurephiafw.h"
 #include "eurephiafw_helpers.h"
diff --git a/plugin/firewall/eurephiafw_struct.h b/plugin/firewall/eurephiafw_struct.h
index 149d47d..b714975 100644
--- a/plugin/firewall/eurephiafw_struct.h
+++ b/plugin/firewall/eurephiafw_struct.h
@@ -21,6 +21,9 @@
 #ifndef   	EUREPHIAFW_STRUCT_H_
 #define   	EUREPHIAFW_STRUCT_H_
 
+#include <mqueue.h>
+#include <semaphore.h>
+
 #include <eurephia_values_struct.h>
 
 //
diff --git a/plugin/firewall/iptables/efw-iptables.c b/plugin/firewall/iptables/efw-iptables.c
index a0807f9..f7ebb0d 100644
--- a/plugin/firewall/iptables/efw-iptables.c
+++ b/plugin/firewall/iptables/efw-iptables.c
@@ -30,7 +30,7 @@
 
 #include <eurephia_nullsafe.h>
 #include <eurephia_log.h>
-#include <eurephia_struct.h>
+#include <eurephia_context.h>
 #include <eurephiafw_helpers.h>
 
 #define INTERFACEVER "1.0"