From: Jason Ish <ish@unx.ca>
Date: Fri, 27 May 2016 07:54:36 +0000 (-0600)
Subject: logging: convert json netflow output to non-thread module
X-Git-Tag: suricata-3.2beta1~380
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01cc50825718171f2adf92d406d9d6d5482f55fb;p=thirdparty%2Fsuricata.git

logging: convert json netflow output to non-thread module
---

diff --git a/src/output-json-netflow.c b/src/output-json-netflow.c
index e131588bb6..2091be08d8 100644
--- a/src/output-json-netflow.c
+++ b/src/output-json-netflow.c
@@ -432,34 +432,22 @@ static TmEcode JsonNetFlowLogThreadDeinit(ThreadVars *t, void *data)
 
 void TmModuleJsonNetFlowLogRegister (void)
 {
-    tmm_modules[TMM_JSONNETFLOWLOG].name = "JsonNetFlowLog";
-    tmm_modules[TMM_JSONNETFLOWLOG].ThreadInit = JsonNetFlowLogThreadInit;
-    tmm_modules[TMM_JSONNETFLOWLOG].ThreadDeinit = JsonNetFlowLogThreadDeinit;
-    tmm_modules[TMM_JSONNETFLOWLOG].RegisterTests = NULL;
-    tmm_modules[TMM_JSONNETFLOWLOG].cap_flags = 0;
-    tmm_modules[TMM_JSONNETFLOWLOG].flags = TM_FLAG_LOGAPI_TM;
-
     /* register as separate module */
     OutputRegisterFlowModule("JsonNetFlowLog", "netflow-json-log",
-            OutputNetFlowLogInit, JsonNetFlowLogger, NULL, NULL, NULL);
+        OutputNetFlowLogInit, JsonNetFlowLogger, JsonNetFlowLogThreadInit,
+        JsonNetFlowLogThreadDeinit, NULL);
 
     /* also register as child of eve-log */
     OutputRegisterFlowSubModule("eve-log", "JsonNetFlowLog", "eve-log.netflow",
-            OutputNetFlowLogInitSub, JsonNetFlowLogger, NULL, NULL, NULL);
+        OutputNetFlowLogInitSub, JsonNetFlowLogger, JsonNetFlowLogThreadInit,
+        JsonNetFlowLogThreadDeinit, NULL);
 }
 
 #else
 
-static TmEcode OutputJsonThreadInit(ThreadVars *t, void *initdata, void **data)
-{
-    SCLogInfo("Can't init JSON output - JSON support was disabled during build.");
-    return TM_ECODE_FAILED;
-}
-
 void TmModuleJsonNetFlowLogRegister (void)
 {
-    tmm_modules[TMM_JSONNETFLOWLOG].name = "JsonNetFlowLog";
-    tmm_modules[TMM_JSONNETFLOWLOG].ThreadInit = OutputJsonThreadInit;
+    SCLogInfo("Can't register JSON output - JSON support was disabled during build.");
 }
 
 #endif
diff --git a/src/tm-modules.c b/src/tm-modules.c
index 67a97767ac..1d1040fcda 100644
--- a/src/tm-modules.c
+++ b/src/tm-modules.c
@@ -244,7 +244,6 @@ const char * TmModuleTmmIdToString(TmmId id)
         CASE_CODE (TMM_STREAMINGLOGGER);
         CASE_CODE (TMM_JSONDROPLOG);
         CASE_CODE (TMM_JSONFILELOG);
-        CASE_CODE (TMM_JSONNETFLOWLOG);
         CASE_CODE (TMM_JSONSMTPLOG);
         CASE_CODE (TMM_JSONSSHLOG);
         CASE_CODE (TMM_JSONSTATSLOG);
diff --git a/src/tm-threads-common.h b/src/tm-threads-common.h
index 9a980ed736..7739146e66 100644
--- a/src/tm-threads-common.h
+++ b/src/tm-threads-common.h
@@ -82,7 +82,6 @@ typedef enum {
     TMM_JSONFILELOG,
     TMM_RECEIVENFLOG,
     TMM_DECODENFLOG,
-    TMM_JSONNETFLOWLOG,
     TMM_LOGSTATSLOG,
     TMM_JSONTEMPLATELOG,