output/plugin: Load internal plugins

This commit adds an interface for loading plugins that are internal to
Suricata. These are always loaded and are in a modified format from
external pliguns.

diff --git a/src/suricata.c b/src/suricata.c
index eb9a3a258099da0825c2c76dbae97c5937ce2902..9efea7780ee78edc4a43e996ce30e3157a97f937 100644 (file)
--- a/src/suricata.c
+++ b/src/suricata.c
@@ -2555,6 +2555,7 @@ 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 14f22d23d0bc4233c8b8947dcaffb5f68f4e870c..912cb2f006851bb35a0b751d94b000ada6c10c54 100644 (file)
--- a/src/util-plugin.c
+++ b/src/util-plugin.c
@@ -85,6 +85,13 @@ static void InitPlugin(char *path)
     }
 }
 
+/**
+ * \brief Load internal plugins
+ */
+void SCInternalLoad(void)
+{
+}
+
 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 f15821f532507cc313cd61569cca36be116a4c44..61c870be9c499faf891c80c2a4e545c0391b200a 100644 (file)
--- a/src/util-plugin.h
+++ b/src/util-plugin.h
@@ -20,6 +20,7 @@
 
 #include "suricata-plugin.h"
 
+void SCInternalLoad(void);
 void SCPluginsLoad(const char *capture_plugin_name, const char *capture_plugin_args);
 SCPluginFileType *SCPluginFindFileType(const char *name);
 SCCapturePlugin *SCPluginFindCaptureByName(const char *name);