Code cleanup: Splitted all structures defined in eurephia_struct.h into separate include files

5 files changed, 87 insertions, 52 deletions

diff --git a/plugin/eurephia.c b/plugin/eurephia.c
index 78b8d7a..0326c62 100644
--- a/plugin/eurephia.c
+++ b/plugin/eurephia.c
@@ -23,6 +23,7 @@
 #include <string.h>
 #include <getopt.h>
 
+#include <eurephia_struct.h>
 #include <eurephiadb.h>
 #include <eurephiadb_driver.h>
 #include <eurephiafw.h>
diff --git a/plugin/eurephia_struct.h b/plugin/eurephia_struct.h
index 3a23459..75ca250 100644
--- a/plugin/eurephia_struct.h
+++ b/plugin/eurephia_struct.h
@@ -32,58 +32,8 @@
 #define SESSION_REGISTERED 3
 #define SESSION_LOGGEDOUT  4
 
-typedef struct __eurephiaVALUES {
-        unsigned int evgid;
-        unsigned int evid;
-        char *key;
-        char *val;
-        struct __eurephiaVALUES *next;
-} eurephiaVALUES;
-
-
-//
-// Struct which contains session unique data
-//
-typedef struct {
-        char *sessionkey;
-        int sessionstatus;
-        eurephiaVALUES *sessvals;
-} eurephiaSESSION;
-
-
-//
-//  Struct containing connection to the database we are using
-//
-typedef struct {
-        void *dbhandle;
-        char *dbname;
-        eurephiaVALUES *config;
-} eDBconn;
-
-
-
-//
-// structs used by the firewall interface
-//
-typedef struct {
-        mqd_t msgq;
-        sem_t *semp_worker;
-        sem_t *semp_master;
-        char *fw_command;
-        void *ctx;
-} efw_threaddata;
-
-typedef struct {
-        efw_threaddata thrdata;
-        pid_t fwproc_pid;
-
-        // Where to update firewall if we block blackisted
-        // IP addr in firewall too
-        char *fwblacklist;
-        char *fwblacklist_sendto;
-        eurephiaVALUES *blacklisted; // Contains all IP addresses we have blacklisted
-} eurephiaFWINTF;
-
+#include "eurephiadb_struct.h"
+#include "eurephiafw_struct.h"
 
 //
 //  main structure for the eurephia module context
diff --git a/plugin/eurephiadb_session.h b/plugin/eurephiadb_session.h
index 47f0049..f364529 100644
--- a/plugin/eurephiadb_session.h
+++ b/plugin/eurephiadb_session.h
@@ -21,6 +21,8 @@
 #ifndef   	EUREPHIADB_SESSION_H_
 # define   	EUREPHIADB_SESSION_H_
 
+#include <eurephiadb_session_struct.h>
+
 #define SESSVAL_NEW      10
 #define SESSVAL_UPDATE   11
 #define SESSVAL_DELETE   12
diff --git a/plugin/eurephiadb_session_struct.h b/plugin/eurephiadb_session_struct.h
new file mode 100644
index 0000000..fcacc8f
--- /dev/null
+++ b/plugin/eurephiadb_session_struct.h
@@ -0,0 +1,34 @@
+/* eurephia_session.h  --  eurephiaSESSION struct typedef
+ *
+ *  GPLv2 - Copyright (C) 2008  David Sommerseth <dazo@users.sourceforge.net>
+ *
+ *  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; version 2
+ *  of the License.
+ *
+ *  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.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ */
+
+#ifndef   	EUREPHIADB_SESSION_STRUCT_H_
+#define   	EUREPHIADB_SESSION_STRUCT_H_
+
+//
+// Struct which contains session unique data
+//
+typedef struct {
+        char *sessionkey;
+        int sessionstatus;
+        eurephiaVALUES *sessvals;
+} eurephiaSESSION;
+
+
+#endif 	    /* !EUREPHIADB_SESSION_STRUCT_H_ */
diff --git a/plugin/firewall/eurephiafw_struct.h b/plugin/firewall/eurephiafw_struct.h
new file mode 100644
index 0000000..149d47d
--- /dev/null
+++ b/plugin/firewall/eurephiafw_struct.h
@@ -0,0 +1,48 @@
+/* eurephiafw.h  --  Firewall interface struct typedef
+ *
+ *  GPLv2 - Copyright (C) 2008  David Sommerseth <dazo@users.sourceforge.net>
+ *
+ *  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; version 2
+ *  of the License.
+ *
+ *  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.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ */
+
+#ifndef   	EUREPHIAFW_STRUCT_H_
+#define   	EUREPHIAFW_STRUCT_H_
+
+#include <eurephia_values_struct.h>
+
+//
+// structs used by the firewall interface
+//
+typedef struct {
+        mqd_t msgq;
+        sem_t *semp_worker;
+        sem_t *semp_master;
+        char *fw_command;
+        void *ctx;
+} efw_threaddata;
+
+typedef struct {
+        efw_threaddata thrdata;
+        pid_t fwproc_pid;
+
+        // Where to update firewall if we block blackisted
+        // IP addr in firewall too
+        char *fwblacklist;
+        char *fwblacklist_sendto;
+        eurephiaVALUES *blacklisted; // Contains all IP addresses we have blacklisted
+} eurephiaFWINTF;
+
+#endif 	    /* !EUREPHIAFW_STRUCT_H_ */