From 7a0737b9a9ce074693f3452f8200d0708936f47c Mon Sep 17 00:00:00 2001 From: Jason Ish Date: Fri, 3 Jun 2016 10:48:10 -0600 Subject: [PATCH] logging: convert tls log to non-thread module --- src/log-tlslog.c | 10 +--------- src/tm-modules.c | 1 - src/tm-threads-common.h | 1 - 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/log-tlslog.c b/src/log-tlslog.c index d0274f222a..0239606362 100644 --- a/src/log-tlslog.c +++ b/src/log-tlslog.c @@ -314,15 +314,7 @@ static int LogTlsLogger(ThreadVars *tv, void *thread_data, const Packet *p, void TmModuleLogTlsLogRegister(void) { - tmm_modules[TMM_LOGTLSLOG].name = MODULE_NAME; - tmm_modules[TMM_LOGTLSLOG].ThreadInit = LogTlsLogThreadInit; - tmm_modules[TMM_LOGTLSLOG].ThreadExitPrintStats = LogTlsLogExitPrintStats; - tmm_modules[TMM_LOGTLSLOG].ThreadDeinit = LogTlsLogThreadDeinit; - tmm_modules[TMM_LOGTLSLOG].RegisterTests = NULL; - tmm_modules[TMM_LOGTLSLOG].cap_flags = 0; - tmm_modules[TMM_LOGTLSLOG].flags = TM_FLAG_LOGAPI_TM; - OutputRegisterTxModuleWithProgress(MODULE_NAME, "tls-log", LogTlsLogInitCtx, ALPROTO_TLS, LogTlsLogger, TLS_HANDSHAKE_DONE, TLS_HANDSHAKE_DONE, - NULL, NULL, NULL); + LogTlsLogThreadInit, LogTlsLogThreadDeinit, LogTlsLogExitPrintStats); } diff --git a/src/tm-modules.c b/src/tm-modules.c index d12089d0aa..d2c22aefef 100644 --- a/src/tm-modules.c +++ b/src/tm-modules.c @@ -212,7 +212,6 @@ const char * TmModuleTmmIdToString(TmmId id) CASE_CODE (TMM_RECEIVEPFRING); CASE_CODE (TMM_DECODEPFRING); CASE_CODE (TMM_RESPONDREJECT); - CASE_CODE (TMM_LOGTLSLOG); CASE_CODE (TMM_PCAPLOG); CASE_CODE (TMM_DECODEIPFW); CASE_CODE (TMM_VERDICTIPFW); diff --git a/src/tm-threads-common.h b/src/tm-threads-common.h index 0938b2f611..eb455888d2 100644 --- a/src/tm-threads-common.h +++ b/src/tm-threads-common.h @@ -42,7 +42,6 @@ typedef enum { TMM_RECEIVEPFRING, TMM_DECODEPFRING, TMM_RESPONDREJECT, - TMM_LOGTLSLOG, TMM_OUTPUTJSON, TMM_PCAPLOG, TMM_DECODEIPFW, -- 2.47.2