From e2021e05c06cefffcb6a2b165fb15bbf84948590 Mon Sep 17 00:00:00 2001
From: David Sommerseth <dazo@users.sourceforge.net>
Date: Fri, 28 Nov 2008 09:57:07 +0100
Subject: Made eurephia_context.h even more generic and independent

eurephia_context.h do only need to know about the eurephiaFWINTF *
struct when compiling the auth plug-in and firewall modules.

To enable this, EUREPHIA_FWINTF needs to be defined as well as the
eurephiafw_struct.h must be included before including eurephia_context.h
in the source.  When this is not done, *fwcfg will just be a void *.
---
 plugin/eurephia-auth.c                  | 3 +++
 plugin/eurephia.c                       | 2 ++
 plugin/eurephiadb_session.c             | 2 ++
 plugin/firewall/eurephiafw.c            | 2 ++
 plugin/firewall/eurephiafw_helpers.c    | 2 ++
 plugin/firewall/iptables/efw-iptables.c | 4 +++-
 6 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'plugin')

diff --git a/plugin/eurephia-auth.c b/plugin/eurephia-auth.c
index 98658c3..81eb046 100644
--- a/plugin/eurephia-auth.c
+++ b/plugin/eurephia-auth.c
@@ -25,6 +25,9 @@
 #include <sqlite3.h>
 
 #include "openvpn-plugin.h"
+#define EUREPHIA_FWINTF
+#include <eurephiafw_struct.h>
+#include <eurephia_context.h>
 #include <eurephiadb.h>
 #include <eurephia.h>
 
diff --git a/plugin/eurephia.c b/plugin/eurephia.c
index 26d60b3..91e44da 100644
--- a/plugin/eurephia.c
+++ b/plugin/eurephia.c
@@ -23,6 +23,8 @@
 #include <string.h>
 #include <getopt.h>
 
+#define EUREPHIA_FWINTF
+#include <eurephiafw_struct.h>
 #include <eurephia_context.h>
 #include <eurephiadb.h>
 #include <eurephiadb_driver.h>
diff --git a/plugin/eurephiadb_session.c b/plugin/eurephiadb_session.c
index 952e016..ab03e37 100644
--- a/plugin/eurephiadb_session.c
+++ b/plugin/eurephiadb_session.c
@@ -27,6 +27,8 @@
 #include <time.h>
 #include <openssl/rand.h>
 
+#define EUREPHIA_FWINTF
+#include <eurephiafw_struct.h>
 #include <eurephia_context.h>
 #include "eurephia_nullsafe.h"
 #include "eurephia_log.h"
diff --git a/plugin/firewall/eurephiafw.c b/plugin/firewall/eurephiafw.c
index f1b15a1..ae383cc 100644
--- a/plugin/firewall/eurephiafw.c
+++ b/plugin/firewall/eurephiafw.c
@@ -30,6 +30,8 @@
 #include <sys/wait.h>
 #include <time.h>
 
+#define EUREPHIA_FWINTF
+#include <eurephiafw_struct.h>
 #include <eurephia_context.h>
 #include "eurephia_log.h"
 #include "eurephiafw.h"
diff --git a/plugin/firewall/eurephiafw_helpers.c b/plugin/firewall/eurephiafw_helpers.c
index 29d2f06..00bf516 100644
--- a/plugin/firewall/eurephiafw_helpers.c
+++ b/plugin/firewall/eurephiafw_helpers.c
@@ -28,6 +28,8 @@
 #include <semaphore.h>
 #include <mqueue.h>
 
+#define EUREPHIA_FWINTF
+#include <eurephiafw_struct.h>
 #include <eurephia_context.h>
 #include "eurephia_log.h"
 #include "eurephiafw.h"
diff --git a/plugin/firewall/iptables/efw-iptables.c b/plugin/firewall/iptables/efw-iptables.c
index f7ebb0d..a5171f7 100644
--- a/plugin/firewall/iptables/efw-iptables.c
+++ b/plugin/firewall/iptables/efw-iptables.c
@@ -28,9 +28,11 @@
 #include <sys/wait.h>
 #include <time.h>
 
+#define EUREPHIA_FWINTF
+#include <eurephiafw_struct.h>
+#include <eurephia_context.h>
 #include <eurephia_nullsafe.h>
 #include <eurephia_log.h>
-#include <eurephia_context.h>
 #include <eurephiafw_helpers.h>
 
 #define INTERFACEVER "1.0"
-- 
cgit