eve: register internal output file types

Register known eve output file types during eve registration. This
removes the function to load internal plugins as they are not really
plugins and moves the registration of them into their respective
subsystem.

diff --git a/src/output-json.c b/src/output-json.c
index f9f8a6b49528f62c094563a3d04418389113911b..226271a9f1c851ca53a1428dc889ab8c80902a39 100644 (file)
--- a/src/output-json.c
+++ b/src/output-json.c
@@ -91,6 +91,10 @@ void OutputJsonRegister (void)
 
     traffic_id_prefix_len = strlen(TRAFFIC_ID_PREFIX);
     traffic_label_prefix_len = strlen(TRAFFIC_LABEL_PREFIX);
+
+    // Register output file types that use the new eve filetype registration
+    // API.
+    SyslogInitialize();
 }
 
 json_t *SCJsonString(const char *val)

diff --git a/src/suricata.c b/src/suricata.c
index 9efea7780ee78edc4a43e996ce30e3157a97f937..eb9a3a258099da0825c2c76dbae97c5937ce2902 100644 (file)
--- a/src/suricata.c
+++ b/src/suricata.c
@@ -2555,7 +2555,6 @@ int PostConfLoadedSetup(SCInstance *suri)
     FeatureTrackingRegister(); /* must occur prior to output mod registration */
     RegisterAllModules();
 #ifdef HAVE_PLUGINS
-    SCInternalLoad();
     SCPluginsLoad(suri->capture_plugin_name, suri->capture_plugin_args);
 #endif
     AppLayerHtpNeedFileInspection();

diff --git a/src/util-plugin.c b/src/util-plugin.c
index deb5333cbfb2afda3bf0a1c0dc426bc2ff3ae1bb..087b55dd2e13e8dd5669381c608155e3d141b569 100644 (file)
--- a/src/util-plugin.c
+++ b/src/util-plugin.c
@@ -86,14 +86,6 @@ static void InitPlugin(char *path)
     }
 }
 
-/**
- * \brief Load internal plugins
- */
-void SCInternalLoad(void)
-{
-    SyslogInitialize();
-}
-
 void SCPluginsLoad(const char *capture_plugin_name, const char *capture_plugin_args)
 {
     ConfNode *conf = ConfGetNode("plugins");

diff --git a/src/util-plugin.h b/src/util-plugin.h
index 21654d86e6ef08c83876f2112fa6840d75428a53..cafe314f75a3887c38cd68b1bc45ff59b84b1ff7 100644 (file)
--- a/src/util-plugin.h
+++ b/src/util-plugin.h
@@ -21,7 +21,6 @@
 #include "suricata-plugin.h"
 #include "output-eve-syslog.h"
 
-void SCInternalLoad(void);
 void SCPluginsLoad(const char *capture_plugin_name, const char *capture_plugin_args);
 SCEveFileType *SCPluginFindFileType(const char *name);
 SCCapturePlugin *SCPluginFindCaptureByName(const char *name);