From: Jason Ish <ish@unx.ca>
Date: Fri, 27 May 2016 16:10:02 +0000 (-0600)
Subject: logging: convert drop output to non-thread module
X-Git-Tag: suricata-3.2beta1~374
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=869d2eb701daa6660692c0344eb0951a24d0db07;p=thirdparty%2Fsuricata.git

logging: convert drop output to non-thread module
---

diff --git a/src/log-droplog.c b/src/log-droplog.c
index 0b466b6a48..c680a42337 100644
--- a/src/log-droplog.c
+++ b/src/log-droplog.c
@@ -494,17 +494,10 @@ static void LogDropLogRegisterTests(void)
 /** \brief function to register the drop log module */
 void TmModuleLogDropLogRegister (void)
 {
-
-    tmm_modules[TMM_LOGDROPLOG].name = MODULE_NAME;
-    tmm_modules[TMM_LOGDROPLOG].ThreadInit = LogDropLogThreadInit;
-    tmm_modules[TMM_LOGDROPLOG].ThreadExitPrintStats = LogDropLogExitPrintStats;
-    tmm_modules[TMM_LOGDROPLOG].ThreadDeinit = LogDropLogThreadDeinit;
+    OutputRegisterPacketModule(MODULE_NAME, "drop", LogDropLogInitCtx,
+        LogDropLogger, LogDropCondition, LogDropLogThreadInit,
+        LogDropLogThreadDeinit, LogDropLogExitPrintStats);
 #ifdef UNITTESTS
-    tmm_modules[TMM_LOGDROPLOG].RegisterTests = LogDropLogRegisterTests;
+    LogDropLogRegisterTests();
 #endif
-    tmm_modules[TMM_LOGDROPLOG].cap_flags = 0;
-    tmm_modules[TMM_LOGDROPLOG].flags = TM_FLAG_LOGAPI_TM;
-
-    OutputRegisterPacketModule(MODULE_NAME, "drop", LogDropLogInitCtx,
-        LogDropLogger, LogDropCondition, NULL, NULL, NULL);
 }