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

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

diff --git a/src/output-json-ssh.c b/src/output-json-ssh.c
index d99c6e8880..313df7c824 100644
--- a/src/output-json-ssh.c
+++ b/src/output-json-ssh.c
@@ -316,34 +316,22 @@ dontlog:
 
 void TmModuleJsonSshLogRegister (void)
 {
-    tmm_modules[TMM_JSONSSHLOG].name = "JsonSshLog";
-    tmm_modules[TMM_JSONSSHLOG].ThreadInit = JsonSshLogThreadInit;
-    tmm_modules[TMM_JSONSSHLOG].ThreadDeinit = JsonSshLogThreadDeinit;
-    tmm_modules[TMM_JSONSSHLOG].RegisterTests = NULL;
-    tmm_modules[TMM_JSONSSHLOG].cap_flags = 0;
-    tmm_modules[TMM_JSONSSHLOG].flags = TM_FLAG_LOGAPI_TM;
-
     /* register as separate module */
     OutputRegisterPacketModule("JsonSshLog", "ssh-json-log", OutputSshLogInit,
-        JsonSshLogger, JsonSshCondition, NULL, NULL, NULL);
+        JsonSshLogger, JsonSshCondition, JsonSshLogThreadInit,
+        JsonSshLogThreadDeinit, NULL);
 
     /* also register as child of eve-log */
     OutputRegisterPacketSubModule("eve-log", "JsonSshLog", "eve-log.ssh",
-        OutputSshLogInitSub, JsonSshLogger, JsonSshCondition, NULL, NULL, NULL);
+        OutputSshLogInitSub, JsonSshLogger, JsonSshCondition,
+        JsonSshLogThreadInit, JsonSshLogThreadDeinit, 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 TmModuleJsonSshLogRegister (void)
 {
-    tmm_modules[TMM_JSONSSHLOG].name = "JsonSshLog";
-    tmm_modules[TMM_JSONSSHLOG].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 1d1040fcda..dc4605e45f 100644
--- a/src/tm-modules.c
+++ b/src/tm-modules.c
@@ -245,7 +245,6 @@ const char * TmModuleTmmIdToString(TmmId id)
         CASE_CODE (TMM_JSONDROPLOG);
         CASE_CODE (TMM_JSONFILELOG);
         CASE_CODE (TMM_JSONSMTPLOG);
-        CASE_CODE (TMM_JSONSSHLOG);
         CASE_CODE (TMM_JSONSTATSLOG);
         CASE_CODE (TMM_OUTPUTJSON);
         CASE_CODE (TMM_FLOWMANAGER);
diff --git a/src/tm-threads-common.h b/src/tm-threads-common.h
index 7739146e66..17c531e085 100644
--- a/src/tm-threads-common.h
+++ b/src/tm-threads-common.h
@@ -77,7 +77,6 @@ typedef enum {
     TMM_STREAMINGLOGGER,
     TMM_JSONDROPLOG,
     TMM_JSONSMTPLOG,
-    TMM_JSONSSHLOG,
     TMM_JSONSTATSLOG,
     TMM_JSONFILELOG,
     TMM_RECEIVENFLOG,