plugins: remove conf.h from suricata-plugin.h

Remove "conf.h" from suricata-plugin.h as its not needed by that
header. However, some other files became transitively dependent on
through other includes, so fix those up.

diff --git a/src/decode-erspan.c b/src/decode-erspan.c
index ccdf64aeaef98db064a6703b90f1ec291fcef63f..76cb9bd5af8c44f0684db245b788203bd6af8cfc 100644 (file)
--- a/src/decode-erspan.c
+++ b/src/decode-erspan.c
@@ -39,6 +39,7 @@
 #include "util-validate.h"
 #include "util-unittest.h"
 #include "util-debug.h"
+#include "conf.h"
 
 /**
  * \brief Functions to decode ERSPAN Type I and II packets

diff --git a/src/defrag-config.c b/src/defrag-config.c
index 7e2ae0cde96a0b0a502df364c7f9efceb1053b87..adb88470499afaa6c4f53f09a9dc369e897c262d 100644 (file)
--- a/src/defrag-config.c
+++ b/src/defrag-config.c
@@ -26,6 +26,7 @@
 #include "defrag-config.h"
 #include "util-misc.h"
 #include "util-radix-tree.h"
+#include "conf.h"
 
 static SCRadixTree *defrag_tree = NULL;
 

diff --git a/src/source-pcap-file.c b/src/source-pcap-file.c
index c4f97bc0c4c12e0d1e23ae7725f0c30d23a5df77..647904a8bdec4b5969b48260d167b1870027c85f 100644 (file)
--- a/src/source-pcap-file.c
+++ b/src/source-pcap-file.c
@@ -31,6 +31,7 @@
 #include "util-checksum.h"
 #include "runmode-unix-socket.h"
 #include "suricata.h"
+#include "conf.h"
 
 extern uint16_t max_pending_packets;
 PcapFileGlobalVars pcap_g;

diff --git a/src/suricata-plugin.h b/src/suricata-plugin.h
index 85a91ef663f2f8137c811c9f906430155e187f5d..639dd7c7313e78d6f6e810f106b3f868935c1adb 100644 (file)
--- a/src/suricata-plugin.h
+++ b/src/suricata-plugin.h
@@ -23,8 +23,6 @@
 
 #include "queue.h"
 
-#include "conf.h"
-
 /**
  * The size of the data chunk inside each packet structure a plugin
  * has for private data (Packet->plugin_v).

diff --git a/src/util-ebpf.h b/src/util-ebpf.h
index 55c1fd608a28b49d677a849d435ac6e75d9b708d..c4f524c3bdd13f81b89841c7f6defbfd19473dca 100644 (file)
--- a/src/util-ebpf.h
+++ b/src/util-ebpf.h
@@ -25,6 +25,7 @@
 #define SURICATA_UTIL_EBPF_H
 
 #include "flow-bypass.h"
+#include "conf.h"
 
 #ifdef HAVE_PACKET_EBPF
 

diff --git a/src/util-exception-policy.c b/src/util-exception-policy.c
index 6c8ba0fba9750861cae0dd3f0c231b827d136f36..05f88f0c9a3b809ff484a17fc10ed05099ee6a08 100644 (file)
--- a/src/util-exception-policy.c
+++ b/src/util-exception-policy.c
@@ -26,6 +26,7 @@
 #include "util-misc.h"
 #include "stream-tcp-reassemble.h"
 #include "action-globals.h"
+#include "conf.h"
 
 enum ExceptionPolicy g_eps_master_switch = EXCEPTION_POLICY_NOT_SET;
 /** true if exception policy was defined in config */

diff --git a/src/util-macset.c b/src/util-macset.c
index 9853a32416808b5a646c1866d16dc3bc8934382a..a4d1eb664c34f1ec81a658c24a89530ee4e61b14 100644 (file)
--- a/src/util-macset.c
+++ b/src/util-macset.c
@@ -33,6 +33,7 @@
 #include "util-macset.h"
 #include "util-unittest.h"
 #include "util-unittest-helper.h"
+#include "conf.h"
 
 typedef uint8_t MacAddr[6];
 typedef enum {

diff --git a/src/util-plugin.c b/src/util-plugin.c
index 472c555b89e496375b1c9b7253c9da14f9b227d3..6d34ff0e66b36480ea5a885e71d08be10951198a 100644 (file)
--- a/src/util-plugin.c
+++ b/src/util-plugin.c
@@ -21,6 +21,7 @@
 #include "runmodes.h"
 #include "util-plugin.h"
 #include "util-debug.h"
+#include "conf.h"
 
 #ifdef HAVE_PLUGINS