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.
pull/6395/head
Jason Ish 4 years ago committed by Victor Julien
parent 784a080201
commit 4cd99fc266

@ -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)

@ -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();

@ -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");

@ -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);

Loading…
Cancel
Save