diff --git a/src/log-httplog.c b/src/log-httplog.c index 8784810072..ae9e7df54a 100644 --- a/src/log-httplog.c +++ b/src/log-httplog.c @@ -65,7 +65,7 @@ int LogHttpLogger(ThreadVars *tv, void *thread_data, const Packet *, Flow *f, vo void LogHttpLogRegister (void) { OutputRegisterTxModule(LOGGER_HTTP, MODULE_NAME, "http-log", LogHttpLogInitCtx, ALPROTO_HTTP1, - LogHttpLogger, LogHttpLogThreadInit, LogHttpLogThreadDeinit, NULL); + LogHttpLogger, LogHttpLogThreadInit, LogHttpLogThreadDeinit); } #define LOG_HTTP_CF_REQUEST_HOST 'h' diff --git a/src/log-tlslog.c b/src/log-tlslog.c index b442932bc4..8d88047e99 100644 --- a/src/log-tlslog.c +++ b/src/log-tlslog.c @@ -501,5 +501,5 @@ void LogTlsLogRegister(void) { OutputRegisterTxModuleWithProgress(LOGGER_TLS, MODULE_NAME, "tls-log", LogTlsLogInitCtx, ALPROTO_TLS, LogTlsLogger, TLS_HANDSHAKE_DONE, TLS_HANDSHAKE_DONE, LogTlsLogThreadInit, - LogTlsLogThreadDeinit, NULL); + LogTlsLogThreadDeinit); } diff --git a/src/log-tlsstore.c b/src/log-tlsstore.c index 4e7ed98b77..ad94fb3d19 100644 --- a/src/log-tlsstore.c +++ b/src/log-tlsstore.c @@ -437,11 +437,11 @@ void LogTlsStoreRegister (void) { OutputRegisterTxModuleWithCondition(LOGGER_TLS_STORE, MODULE_NAME, "tls-store", LogTlsStoreLogInitCtx, ALPROTO_TLS, LogTlsStoreLogger, LogTlsStoreCondition, - LogTlsStoreLogThreadInit, LogTlsStoreLogThreadDeinit, NULL); + LogTlsStoreLogThreadInit, LogTlsStoreLogThreadDeinit); OutputRegisterTxModuleWithCondition(LOGGER_TLS_STORE_CLIENT, MODULE_NAME, "tls-store", LogTlsStoreLogInitCtx, ALPROTO_TLS, LogTlsStoreLoggerClient, LogTlsStoreConditionClient, - LogTlsStoreLogThreadInit, LogTlsStoreLogThreadDeinit, NULL); + LogTlsStoreLogThreadInit, LogTlsStoreLogThreadDeinit); SC_ATOMIC_INIT(cert_id); SC_ATOMIC_SET(cert_id, 1); diff --git a/src/output-json-anomaly.c b/src/output-json-anomaly.c index 1680530280..241cb974a7 100644 --- a/src/output-json-anomaly.c +++ b/src/output-json-anomaly.c @@ -454,8 +454,7 @@ void JsonAnomalyLogRegister (void) JsonAnomalyLogInitCtxSub, JsonAnomalyLogger, JsonAnomalyLogCondition, JsonAnomalyLogThreadInit, JsonAnomalyLogThreadDeinit); - OutputRegisterTxSubModule(LOGGER_JSON_ANOMALY, "eve-log", MODULE_NAME, - "eve-log.anomaly", JsonAnomalyLogInitCtxHelper, ALPROTO_UNKNOWN, - JsonAnomalyTxLogger, JsonAnomalyLogThreadInit, - JsonAnomalyLogThreadDeinit, NULL); + OutputRegisterTxSubModule(LOGGER_JSON_ANOMALY, "eve-log", MODULE_NAME, "eve-log.anomaly", + JsonAnomalyLogInitCtxHelper, ALPROTO_UNKNOWN, JsonAnomalyTxLogger, + JsonAnomalyLogThreadInit, JsonAnomalyLogThreadDeinit); } diff --git a/src/output-json-dcerpc.c b/src/output-json-dcerpc.c index 6ec19a0b84..17e0199ed7 100644 --- a/src/output-json-dcerpc.c +++ b/src/output-json-dcerpc.c @@ -69,7 +69,7 @@ void JsonDCERPCLogRegister(void) /* Register as an eve sub-module. */ OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonDCERPCLog", "eve-log.dcerpc", DCERPCLogInitSub, ALPROTO_DCERPC, JsonDCERPCLogger, JsonLogThreadInit, - JsonLogThreadDeinit, NULL); + JsonLogThreadDeinit); SCLogDebug("DCERPC JSON logger registered."); } diff --git a/src/output-json-dhcp.c b/src/output-json-dhcp.c index d6a2111291..9c7d9dff92 100644 --- a/src/output-json-dhcp.c +++ b/src/output-json-dhcp.c @@ -148,5 +148,5 @@ void JsonDHCPLogRegister(void) /* Register as an eve sub-module. */ OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonDHCPLog", "eve-log.dhcp", OutputDHCPLogInitSub, ALPROTO_DHCP, JsonDHCPLogger, JsonDHCPLogThreadInit, - JsonDHCPLogThreadDeinit, NULL); + JsonDHCPLogThreadDeinit); } diff --git a/src/output-json-dnp3.c b/src/output-json-dnp3.c index 7bf4ecc860..53cecd78a1 100644 --- a/src/output-json-dnp3.c +++ b/src/output-json-dnp3.c @@ -365,5 +365,5 @@ void JsonDNP3LogRegister(void) { OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonDNP3Log", "eve-log.dnp3", OutputDNP3LogInitSub, ALPROTO_DNP3, JsonDNP3Logger, JsonDNP3LogThreadInit, - JsonDNP3LogThreadDeinit, NULL); + JsonDNP3LogThreadDeinit); } diff --git a/src/output-json-dns.c b/src/output-json-dns.c index 3a72cb7c58..3954da2336 100644 --- a/src/output-json-dns.c +++ b/src/output-json-dns.c @@ -672,12 +672,12 @@ void JsonDnsLogRegister (void) { OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", MODULE_NAME, "eve-log.dns", JsonDnsLogInitCtxSub, ALPROTO_DNS, JsonDnsLogger, LogDnsLogThreadInit, - LogDnsLogThreadDeinit, NULL); + LogDnsLogThreadDeinit); } void JsonDoh2LogRegister(void) { OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonDoH2Log", "eve-log.doh2", JsonDnsLogInitCtxSub, ALPROTO_DOH2, JsonDoh2Logger, LogDnsLogThreadInit, - LogDnsLogThreadDeinit, NULL); + LogDnsLogThreadDeinit); } diff --git a/src/output-json-http.c b/src/output-json-http.c index abbeaf07ed..3588a0e355 100644 --- a/src/output-json-http.c +++ b/src/output-json-http.c @@ -654,5 +654,5 @@ void JsonHttpLogRegister (void) /* register as child of eve-log */ OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonHttpLog", "eve-log.http", OutputHttpLogInitSub, ALPROTO_HTTP1, JsonHttpLogger, JsonHttpLogThreadInit, - JsonHttpLogThreadDeinit, NULL); + JsonHttpLogThreadDeinit); } diff --git a/src/output-json-ike.c b/src/output-json-ike.c index e238a72e4f..470026fde1 100644 --- a/src/output-json-ike.c +++ b/src/output-json-ike.c @@ -184,5 +184,5 @@ void JsonIKELogRegister(void) /* Register as an eve sub-module. */ OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonIKELog", "eve-log.ike", OutputIKELogInitSub, ALPROTO_IKE, JsonIKELogger, JsonIKELogThreadInit, - JsonIKELogThreadDeinit, NULL); + JsonIKELogThreadDeinit); } diff --git a/src/output-json-mqtt.c b/src/output-json-mqtt.c index 777107f3e9..66cf67a033 100644 --- a/src/output-json-mqtt.c +++ b/src/output-json-mqtt.c @@ -194,5 +194,5 @@ void JsonMQTTLogRegister(void) { OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonMQTTLog", "eve-log.mqtt", OutputMQTTLogInitSub, ALPROTO_MQTT, JsonMQTTLogger, JsonMQTTLogThreadInit, - JsonMQTTLogThreadDeinit, NULL); + JsonMQTTLogThreadDeinit); } diff --git a/src/output-json-nfs.c b/src/output-json-nfs.c index 946f85cdbb..72274a6b78 100644 --- a/src/output-json-nfs.c +++ b/src/output-json-nfs.c @@ -111,7 +111,7 @@ void JsonNFSLogRegister(void) { /* Register as an eve sub-module. */ OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonNFSLog", "eve-log.nfs", NFSLogInitSub, - ALPROTO_NFS, JsonNFSLogger, JsonLogThreadInit, JsonLogThreadDeinit, NULL); + ALPROTO_NFS, JsonNFSLogger, JsonLogThreadInit, JsonLogThreadDeinit); SCLogDebug("NFS JSON logger registered."); } diff --git a/src/output-json-pgsql.c b/src/output-json-pgsql.c index d82602e351..14ed46f094 100644 --- a/src/output-json-pgsql.c +++ b/src/output-json-pgsql.c @@ -192,7 +192,7 @@ void JsonPgsqlLogRegister(void) /* Register as an eve sub-module. */ OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonPgsqlLog", "eve-log.pgsql", OutputPgsqlLogInitSub, ALPROTO_PGSQL, JsonPgsqlLogger, JsonPgsqlLogThreadInit, - JsonPgsqlLogThreadDeinit, NULL); + JsonPgsqlLogThreadDeinit); SCLogDebug("PostgreSQL JSON logger registered."); } diff --git a/src/output-json-smb.c b/src/output-json-smb.c index 492c50fe27..279ee772e8 100644 --- a/src/output-json-smb.c +++ b/src/output-json-smb.c @@ -80,7 +80,7 @@ void JsonSMBLogRegister(void) { /* Register as an eve sub-module. */ OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonSMBLog", "eve-log.smb", SMBLogInitSub, - ALPROTO_SMB, JsonSMBLogger, JsonLogThreadInit, JsonLogThreadDeinit, NULL); + ALPROTO_SMB, JsonSMBLogger, JsonLogThreadInit, JsonLogThreadDeinit); SCLogDebug("SMB JSON logger registered."); } diff --git a/src/output-json-smtp.c b/src/output-json-smtp.c index f7674687c5..bddbc4a9fc 100644 --- a/src/output-json-smtp.c +++ b/src/output-json-smtp.c @@ -193,5 +193,5 @@ void JsonSmtpLogRegister (void) { /* register as child of eve-log */ OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonSmtpLog", "eve-log.smtp", OutputSmtpLogInitSub, ALPROTO_SMTP, JsonSmtpLogger, JsonSmtpLogThreadInit, - JsonSmtpLogThreadDeinit, NULL); + JsonSmtpLogThreadDeinit); } diff --git a/src/output-json-tls.c b/src/output-json-tls.c index 406f6aca01..40c15bd7fc 100644 --- a/src/output-json-tls.c +++ b/src/output-json-tls.c @@ -718,5 +718,5 @@ void JsonTlsLogRegister (void) /* register as child of eve-log */ OutputRegisterTxSubModuleWithProgress(LOGGER_JSON_TX, "eve-log", "JsonTlsLog", "eve-log.tls", OutputTlsLogInitSub, ALPROTO_TLS, JsonTlsLogger, TLS_HANDSHAKE_DONE, TLS_HANDSHAKE_DONE, - JsonTlsLogThreadInit, JsonTlsLogThreadDeinit, NULL); + JsonTlsLogThreadInit, JsonTlsLogThreadDeinit); } diff --git a/src/output-tx.c b/src/output-tx.c index ca1e55441c..30fee3c370 100644 --- a/src/output-tx.c +++ b/src/output-tx.c @@ -58,15 +58,13 @@ typedef struct OutputTxLogger_ { int ts_log_progress; TmEcode (*ThreadInit)(ThreadVars *, const void *, void **); TmEcode (*ThreadDeinit)(ThreadVars *, void *); - void (*ThreadExitPrintStats)(ThreadVars *, void *); } OutputTxLogger; static OutputTxLogger **list = NULL; int OutputRegisterTxLogger(LoggerId id, const char *name, AppProto alproto, TxLogger LogFunc, void *initdata, int tc_log_progress, int ts_log_progress, TxLoggerCondition LogCondition, - ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit, - void (*ThreadExitPrintStats)(ThreadVars *, void *)) + ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit) { if (list == NULL) { list = SCCalloc(ALPROTO_MAX, sizeof(OutputTxLogger *)); @@ -93,7 +91,6 @@ int OutputRegisterTxLogger(LoggerId id, const char *name, AppProto alproto, TxLo op->logger_id = id; op->ThreadInit = ThreadInit; op->ThreadDeinit = ThreadDeinit; - op->ThreadExitPrintStats = ThreadExitPrintStats; if (alproto == ALPROTO_UNKNOWN) { op->tc_log_progress = 0; @@ -628,25 +625,6 @@ static TmEcode OutputTxLogThreadDeinit(ThreadVars *tv, void *thread_data) return TM_ECODE_OK; } -static void OutputTxLogExitPrintStats(ThreadVars *tv, void *thread_data) -{ - OutputTxLoggerThreadData *op_thread_data = (OutputTxLoggerThreadData *)thread_data; - - for (AppProto alproto = 0; alproto < ALPROTO_MAX; alproto++) { - OutputLoggerThreadStore *store = op_thread_data->store[alproto]; - OutputTxLogger *logger = list[alproto]; - - while (logger && store) { - if (logger->ThreadExitPrintStats) { - logger->ThreadExitPrintStats(tv, store->thread_data); - } - - logger = logger->next; - store = store->next; - } - } -} - static uint32_t OutputTxLoggerGetActiveCount(void) { uint32_t cnt = 0; @@ -676,8 +654,8 @@ void OutputTxLoggerRegister (void) if (unlikely(list == NULL)) { FatalError("Failed to allocate OutputTx list"); } - OutputRegisterRootLogger(OutputTxLogThreadInit, OutputTxLogThreadDeinit, - OutputTxLogExitPrintStats, OutputTxLog, OutputTxLoggerGetActiveCount); + OutputRegisterRootLogger(OutputTxLogThreadInit, OutputTxLogThreadDeinit, NULL, OutputTxLog, + OutputTxLoggerGetActiveCount); } void OutputTxShutdown(void) diff --git a/src/output-tx.h b/src/output-tx.h index 85c2f229de..c733c7c35a 100644 --- a/src/output-tx.h +++ b/src/output-tx.h @@ -40,7 +40,7 @@ typedef bool (*TxLoggerCondition)( int OutputRegisterTxLogger(LoggerId id, const char *name, AppProto alproto, TxLogger LogFunc, void *, int tc_log_progress, int ts_log_progress, TxLoggerCondition LogCondition, - ThreadInitFunc, ThreadDeinitFunc, void (*ThreadExitPrintStats)(ThreadVars *, void *)); + ThreadInitFunc, ThreadDeinitFunc); void OutputTxLoggerRegister (void); diff --git a/src/output.c b/src/output.c index 7b010fe6fb..f941be7d01 100644 --- a/src/output.c +++ b/src/output.c @@ -243,12 +243,10 @@ error: * * \retval Returns 0 on success, -1 on failure. */ -static void OutputRegisterTxModuleWrapper(LoggerId id, const char *name, - const char *conf_name, OutputInitFunc InitFunc, AppProto alproto, - TxLogger TxLogFunc, int tc_log_progress, int ts_log_progress, - TxLoggerCondition TxLogCondition, ThreadInitFunc ThreadInit, - ThreadDeinitFunc ThreadDeinit, - ThreadExitPrintStatsFunc ThreadExitPrintStats) +static void OutputRegisterTxModuleWrapper(LoggerId id, const char *name, const char *conf_name, + OutputInitFunc InitFunc, AppProto alproto, TxLogger TxLogFunc, int tc_log_progress, + int ts_log_progress, TxLoggerCondition TxLogCondition, ThreadInitFunc ThreadInit, + ThreadDeinitFunc ThreadDeinit) { if (unlikely(TxLogFunc == NULL)) { goto error; @@ -270,7 +268,6 @@ static void OutputRegisterTxModuleWrapper(LoggerId id, const char *name, module->ts_log_progress = ts_log_progress; module->ThreadInit = ThreadInit; module->ThreadDeinit = ThreadDeinit; - module->ThreadExitPrintStats = ThreadExitPrintStats; TAILQ_INSERT_TAIL(&output_modules, module, entries); SCLogDebug("Tx logger \"%s\" registered.", name); @@ -279,12 +276,10 @@ error: FatalError("Fatal error encountered. Exiting..."); } -static void OutputRegisterTxSubModuleWrapper(LoggerId id, const char *parent_name, - const char *name, const char *conf_name, OutputInitSubFunc InitFunc, - AppProto alproto, TxLogger TxLogFunc, int tc_log_progress, - int ts_log_progress, TxLoggerCondition TxLogCondition, - ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit, - ThreadExitPrintStatsFunc ThreadExitPrintStats) +static void OutputRegisterTxSubModuleWrapper(LoggerId id, const char *parent_name, const char *name, + const char *conf_name, OutputInitSubFunc InitFunc, AppProto alproto, TxLogger TxLogFunc, + int tc_log_progress, int ts_log_progress, TxLoggerCondition TxLogCondition, + ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit) { if (unlikely(TxLogFunc == NULL)) { goto error; @@ -307,7 +302,6 @@ static void OutputRegisterTxSubModuleWrapper(LoggerId id, const char *parent_nam module->ts_log_progress = ts_log_progress; module->ThreadInit = ThreadInit; module->ThreadDeinit = ThreadDeinit; - module->ThreadExitPrintStats = ThreadExitPrintStats; TAILQ_INSERT_TAIL(&output_modules, module, entries); SCLogDebug("Tx logger for alproto %d \"%s\" registered.", alproto, name); @@ -324,27 +318,20 @@ error: * * \retval Returns 0 on success, -1 on failure. */ -void OutputRegisterTxModuleWithCondition(LoggerId id, const char *name, - const char *conf_name, OutputInitFunc InitFunc, AppProto alproto, - TxLogger TxLogFunc, TxLoggerCondition TxLogCondition, - ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit, - ThreadExitPrintStatsFunc ThreadExitPrintStats) +void OutputRegisterTxModuleWithCondition(LoggerId id, const char *name, const char *conf_name, + OutputInitFunc InitFunc, AppProto alproto, TxLogger TxLogFunc, + TxLoggerCondition TxLogCondition, ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit) { - OutputRegisterTxModuleWrapper(id, name, conf_name, InitFunc, alproto, - TxLogFunc, -1, -1, TxLogCondition, ThreadInit, ThreadDeinit, - ThreadExitPrintStats); + OutputRegisterTxModuleWrapper(id, name, conf_name, InitFunc, alproto, TxLogFunc, -1, -1, + TxLogCondition, ThreadInit, ThreadDeinit); } -void OutputRegisterTxSubModuleWithCondition(LoggerId id, - const char *parent_name, const char *name, const char *conf_name, - OutputInitSubFunc InitFunc, AppProto alproto, TxLogger TxLogFunc, - TxLoggerCondition TxLogCondition, ThreadInitFunc ThreadInit, - ThreadDeinitFunc ThreadDeinit, - ThreadExitPrintStatsFunc ThreadExitPrintStats) +void OutputRegisterTxSubModuleWithCondition(LoggerId id, const char *parent_name, const char *name, + const char *conf_name, OutputInitSubFunc InitFunc, AppProto alproto, TxLogger TxLogFunc, + TxLoggerCondition TxLogCondition, ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit) { - OutputRegisterTxSubModuleWrapper(id, parent_name, name, conf_name, InitFunc, - alproto, TxLogFunc, -1, -1, TxLogCondition, ThreadInit, ThreadDeinit, - ThreadExitPrintStats); + OutputRegisterTxSubModuleWrapper(id, parent_name, name, conf_name, InitFunc, alproto, TxLogFunc, + -1, -1, TxLogCondition, ThreadInit, ThreadDeinit); } /** @@ -355,27 +342,21 @@ void OutputRegisterTxSubModuleWithCondition(LoggerId id, * * \retval Returns 0 on success, -1 on failure. */ -void OutputRegisterTxModuleWithProgress(LoggerId id, const char *name, - const char *conf_name, OutputInitFunc InitFunc, AppProto alproto, - TxLogger TxLogFunc, int tc_log_progress, int ts_log_progress, - ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit, - ThreadExitPrintStatsFunc ThreadExitPrintStats) +void OutputRegisterTxModuleWithProgress(LoggerId id, const char *name, const char *conf_name, + OutputInitFunc InitFunc, AppProto alproto, TxLogger TxLogFunc, int tc_log_progress, + int ts_log_progress, ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit) { - OutputRegisterTxModuleWrapper(id, name, conf_name, InitFunc, alproto, - TxLogFunc, tc_log_progress, ts_log_progress, NULL, ThreadInit, - ThreadDeinit, ThreadExitPrintStats); + OutputRegisterTxModuleWrapper(id, name, conf_name, InitFunc, alproto, TxLogFunc, + tc_log_progress, ts_log_progress, NULL, ThreadInit, ThreadDeinit); } -void OutputRegisterTxSubModuleWithProgress(LoggerId id, const char *parent_name, - const char *name, const char *conf_name, OutputInitSubFunc InitFunc, - AppProto alproto, TxLogger TxLogFunc, int tc_log_progress, - int ts_log_progress, ThreadInitFunc ThreadInit, - ThreadDeinitFunc ThreadDeinit, - ThreadExitPrintStatsFunc ThreadExitPrintStats) +void OutputRegisterTxSubModuleWithProgress(LoggerId id, const char *parent_name, const char *name, + const char *conf_name, OutputInitSubFunc InitFunc, AppProto alproto, TxLogger TxLogFunc, + int tc_log_progress, int ts_log_progress, ThreadInitFunc ThreadInit, + ThreadDeinitFunc ThreadDeinit) { - OutputRegisterTxSubModuleWrapper(id, parent_name, name, conf_name, InitFunc, - alproto, TxLogFunc, tc_log_progress, ts_log_progress, NULL, ThreadInit, - ThreadDeinit, ThreadExitPrintStats); + OutputRegisterTxSubModuleWrapper(id, parent_name, name, conf_name, InitFunc, alproto, TxLogFunc, + tc_log_progress, ts_log_progress, NULL, ThreadInit, ThreadDeinit); } /** @@ -386,26 +367,20 @@ void OutputRegisterTxSubModuleWithProgress(LoggerId id, const char *parent_name, * * \retval Returns 0 on success, -1 on failure. */ -void OutputRegisterTxModule(LoggerId id, const char *name, - const char *conf_name, OutputInitFunc InitFunc, AppProto alproto, - TxLogger TxLogFunc, ThreadInitFunc ThreadInit, - ThreadDeinitFunc ThreadDeinit, - ThreadExitPrintStatsFunc ThreadExitPrintStats) +void OutputRegisterTxModule(LoggerId id, const char *name, const char *conf_name, + OutputInitFunc InitFunc, AppProto alproto, TxLogger TxLogFunc, ThreadInitFunc ThreadInit, + ThreadDeinitFunc ThreadDeinit) { - OutputRegisterTxModuleWrapper(id, name, conf_name, InitFunc, alproto, - TxLogFunc, -1, -1, NULL, ThreadInit, ThreadDeinit, - ThreadExitPrintStats); + OutputRegisterTxModuleWrapper(id, name, conf_name, InitFunc, alproto, TxLogFunc, -1, -1, NULL, + ThreadInit, ThreadDeinit); } -void OutputRegisterTxSubModule(LoggerId id, const char *parent_name, - const char *name, const char *conf_name, - OutputInitSubFunc InitFunc, AppProto alproto, TxLogger TxLogFunc, - ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit, - ThreadExitPrintStatsFunc ThreadExitPrintStats) +void OutputRegisterTxSubModule(LoggerId id, const char *parent_name, const char *name, + const char *conf_name, OutputInitSubFunc InitFunc, AppProto alproto, TxLogger TxLogFunc, + ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit) { - OutputRegisterTxSubModuleWrapper(id, parent_name, name, conf_name, - InitFunc, alproto, TxLogFunc, -1, -1, NULL, ThreadInit, ThreadDeinit, - ThreadExitPrintStats); + OutputRegisterTxSubModuleWrapper(id, parent_name, name, conf_name, InitFunc, alproto, TxLogFunc, + -1, -1, NULL, ThreadInit, ThreadDeinit); } /** @@ -1033,7 +1008,7 @@ void OutputRegisterLoggers(void) JsonHttpLogRegister(); OutputRegisterTxSubModuleWithProgress(LOGGER_JSON_TX, "eve-log", "LogHttp2Log", "eve-log.http2", OutputJsonLogInitSub, ALPROTO_HTTP2, JsonGenericDirFlowLogger, HTTP2StateClosed, - HTTP2StateClosed, JsonLogThreadInit, JsonLogThreadDeinit, NULL); + HTTP2StateClosed, JsonLogThreadInit, JsonLogThreadDeinit); /* tls log */ LogTlsLogRegister(); JsonTlsLogRegister(); @@ -1041,7 +1016,7 @@ void OutputRegisterLoggers(void) /* ssh */ OutputRegisterTxSubModuleWithCondition(LOGGER_JSON_TX, "eve-log", "JsonSshLog", "eve-log.ssh", OutputJsonLogInitSub, ALPROTO_SSH, JsonGenericDirFlowLogger, SSHTxLogCondition, - JsonLogThreadInit, JsonLogThreadDeinit, NULL); + JsonLogThreadInit, JsonLogThreadDeinit); /* pcap log */ PcapLogRegister(); /* file log */ @@ -1052,7 +1027,7 @@ void OutputRegisterLoggers(void) /* modbus */ OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonModbusLog", "eve-log.modbus", OutputJsonLogInitSub, ALPROTO_MODBUS, JsonGenericDirFlowLogger, JsonLogThreadInit, - JsonLogThreadDeinit, NULL); + JsonLogThreadDeinit); SCLogDebug("modbus json logger registered."); /* tcp streaming data */ @@ -1077,16 +1052,16 @@ void OutputRegisterLoggers(void) /* TFTP JSON logger. */ OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonTFTPLog", "eve-log.tftp", OutputJsonLogInitSub, ALPROTO_TFTP, JsonGenericDirPacketLogger, JsonLogThreadInit, - JsonLogThreadDeinit, NULL); + JsonLogThreadDeinit); SCLogDebug("TFTP JSON logger registered."); /* FTP and FTP-DATA JSON loggers. */ OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonFTPLog", "eve-log.ftp", OutputJsonLogInitSub, ALPROTO_FTP, JsonGenericDirFlowLogger, JsonLogThreadInit, - JsonLogThreadDeinit, NULL); + JsonLogThreadDeinit); OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonFTPLog", "eve-log.ftp", OutputJsonLogInitSub, ALPROTO_FTPDATA, JsonGenericDirFlowLogger, JsonLogThreadInit, - JsonLogThreadDeinit, NULL); + JsonLogThreadDeinit); SCLogDebug("FTP JSON logger registered."); /* SMB JSON logger. */ @@ -1096,13 +1071,13 @@ void OutputRegisterLoggers(void) /* KRB5 JSON logger. */ OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonKRB5Log", "eve-log.krb5", OutputJsonLogInitSub, ALPROTO_KRB5, JsonGenericDirPacketLogger, JsonLogThreadInit, - JsonLogThreadDeinit, NULL); + JsonLogThreadDeinit); SCLogDebug("KRB5 JSON logger registered."); /* QUIC JSON logger. */ OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonQuicLog", "eve-log.quic", OutputJsonLogInitSub, ALPROTO_QUIC, JsonGenericDirPacketLogger, JsonLogThreadInit, - JsonLogThreadDeinit, NULL); + JsonLogThreadDeinit); SCLogDebug("quic json logger registered."); /* DHCP JSON logger. */ @@ -1110,19 +1085,19 @@ void OutputRegisterLoggers(void) /* SNMP JSON logger. */ OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonSNMPLog", "eve-log.snmp", OutputJsonLogInitSub, ALPROTO_SNMP, JsonGenericDirPacketLogger, JsonLogThreadInit, - JsonLogThreadDeinit, NULL); + JsonLogThreadDeinit); SCLogDebug("SNMP JSON logger registered."); /* SIP JSON logger. */ OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonSIPLog", "eve-log.sip", OutputJsonLogInitSub, ALPROTO_SIP, JsonGenericDirPacketLogger, JsonLogThreadInit, - JsonLogThreadDeinit, NULL); + JsonLogThreadDeinit); SCLogDebug("SIP JSON logger registered."); /* RFB JSON logger. */ OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonRFBLog", "eve-log.rfb", OutputJsonLogInitSub, ALPROTO_RFB, JsonGenericDirPacketLogger, JsonLogThreadInit, - JsonLogThreadDeinit, NULL); + JsonLogThreadDeinit); /* MQTT JSON logger. */ JsonMQTTLogRegister(); /* Pgsql JSON logger. */ @@ -1130,25 +1105,25 @@ void OutputRegisterLoggers(void) /* WebSocket JSON logger. */ OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonWebSocketLog", "eve-log.websocket", OutputJsonLogInitSub, ALPROTO_WEBSOCKET, JsonGenericDirPacketLogger, JsonLogThreadInit, - JsonLogThreadDeinit, NULL); + JsonLogThreadDeinit); /* Enip JSON logger. */ OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonEnipLog", "eve-log.enip", OutputJsonLogInitSub, ALPROTO_ENIP, JsonGenericDirFlowLogger, JsonLogThreadInit, - JsonLogThreadDeinit, NULL); + JsonLogThreadDeinit); /* Ldap JSON logger. */ OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonLdapLog", "eve-log.ldap", OutputJsonLogInitSub, ALPROTO_LDAP, JsonGenericDirFlowLogger, JsonLogThreadInit, - JsonLogThreadDeinit, NULL); + JsonLogThreadDeinit); /* DoH2 JSON logger. */ JsonDoh2LogRegister(); /* Template JSON logger. */ OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonTemplateLog", "eve-log.template", OutputJsonLogInitSub, ALPROTO_TEMPLATE, JsonGenericDirPacketLogger, JsonLogThreadInit, - JsonLogThreadDeinit, NULL); + JsonLogThreadDeinit); /* RDP JSON logger. */ OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonRdpLog", "eve-log.rdp", OutputJsonLogInitSub, ALPROTO_RDP, JsonGenericDirPacketLogger, JsonLogThreadInit, - JsonLogThreadDeinit, NULL); + JsonLogThreadDeinit); SCLogDebug("rdp json logger registered."); /* DCERPC JSON logger. */ JsonDCERPCLogRegister(); @@ -1159,7 +1134,7 @@ void OutputRegisterLoggers(void) /* Register as an eve sub-module. */ OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonBitTorrentDHTLog", "eve-log.bittorrent-dht", OutputJsonLogInitSub, ALPROTO_BITTORRENT_DHT, - JsonGenericDirPacketLogger, JsonLogThreadInit, JsonLogThreadDeinit, NULL); + JsonGenericDirPacketLogger, JsonLogThreadInit, JsonLogThreadDeinit); } /* ARP JSON logger */ JsonArpLogRegister(); diff --git a/src/output.h b/src/output.h index 4abb529961..f85fcfd874 100644 --- a/src/output.h +++ b/src/output.h @@ -94,40 +94,27 @@ void OutputRegisterPacketSubModule(LoggerId id, const char *parent_name, const c const char *conf_name, OutputInitSubFunc InitFunc, PacketLogger LogFunc, PacketLogCondition ConditionFunc, ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit); -void OutputRegisterTxModule(LoggerId id, const char *name, - const char *conf_name, OutputInitFunc InitFunc, AppProto alproto, - TxLogger TxLogFunc, ThreadInitFunc ThreadInit, - ThreadDeinitFunc ThreadDeinit, - ThreadExitPrintStatsFunc ThreadExitPrintStats); -void OutputRegisterTxSubModule(LoggerId id, const char *parent_name, - const char *name, const char *conf_name, - OutputInitSubFunc InitFunc, AppProto alproto, TxLogger TxLogFunc, - ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit, - ThreadExitPrintStatsFunc ThreadExitPrintStats); - -void OutputRegisterTxModuleWithCondition(LoggerId id, const char *name, - const char *conf_name, OutputInitFunc InitFunc, AppProto alproto, - TxLogger TxLogFunc, TxLoggerCondition TxLogCondition, - ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit, - ThreadExitPrintStatsFunc ThreadExitPrintStats); -void OutputRegisterTxSubModuleWithCondition(LoggerId id, - const char *parent_name, const char *name, const char *conf_name, - OutputInitSubFunc InitFunc, AppProto alproto, - TxLogger TxLogFunc, TxLoggerCondition TxLogCondition, - ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit, - ThreadExitPrintStatsFunc ThreadExitPrintStats); +void OutputRegisterTxModule(LoggerId id, const char *name, const char *conf_name, + OutputInitFunc InitFunc, AppProto alproto, TxLogger TxLogFunc, ThreadInitFunc ThreadInit, + ThreadDeinitFunc ThreadDeinit); +void OutputRegisterTxSubModule(LoggerId id, const char *parent_name, const char *name, + const char *conf_name, OutputInitSubFunc InitFunc, AppProto alproto, TxLogger TxLogFunc, + ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit); -void OutputRegisterTxModuleWithProgress(LoggerId id, const char *name, - const char *conf_name, OutputInitFunc InitFunc, AppProto alproto, - TxLogger TxLogFunc, int tc_log_progress, int ts_log_progress, - ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit, - ThreadExitPrintStatsFunc ThreadExitPrintStats); -void OutputRegisterTxSubModuleWithProgress(LoggerId id, const char *parent_name, - const char *name, const char *conf_name, - OutputInitSubFunc InitFunc, AppProto alproto, TxLogger TxLogFunc, - int tc_log_progress, int ts_log_progress, ThreadInitFunc ThreadInit, - ThreadDeinitFunc ThreadDeinit, - ThreadExitPrintStatsFunc ThreadExitPrintStats); +void OutputRegisterTxModuleWithCondition(LoggerId id, const char *name, const char *conf_name, + OutputInitFunc InitFunc, AppProto alproto, TxLogger TxLogFunc, + TxLoggerCondition TxLogCondition, ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit); +void OutputRegisterTxSubModuleWithCondition(LoggerId id, const char *parent_name, const char *name, + const char *conf_name, OutputInitSubFunc InitFunc, AppProto alproto, TxLogger TxLogFunc, + TxLoggerCondition TxLogCondition, ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit); + +void OutputRegisterTxModuleWithProgress(LoggerId id, const char *name, const char *conf_name, + OutputInitFunc InitFunc, AppProto alproto, TxLogger TxLogFunc, int tc_log_progress, + int ts_log_progress, ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit); +void OutputRegisterTxSubModuleWithProgress(LoggerId id, const char *parent_name, const char *name, + const char *conf_name, OutputInitSubFunc InitFunc, AppProto alproto, TxLogger TxLogFunc, + int tc_log_progress, int ts_log_progress, ThreadInitFunc ThreadInit, + ThreadDeinitFunc ThreadDeinit); void OutputRegisterFileSubModule(LoggerId id, const char *parent_name, const char *name, const char *conf_name, diff --git a/src/runmodes.c b/src/runmodes.c index f092e4066e..034e0e35a7 100644 --- a/src/runmodes.c +++ b/src/runmodes.c @@ -622,11 +622,9 @@ static void SetupOutput( module->PacketConditionFunc, output_ctx, module->ThreadInit, module->ThreadDeinit); } else if (module->TxLogFunc) { SCLogDebug("%s is a tx logger", module->name); - OutputRegisterTxLogger(module->logger_id, module->name, module->alproto, - module->TxLogFunc, output_ctx, module->tc_log_progress, - module->ts_log_progress, module->TxLogCondition, - module->ThreadInit, module->ThreadDeinit, - module->ThreadExitPrintStats); + OutputRegisterTxLogger(module->logger_id, module->name, module->alproto, module->TxLogFunc, + output_ctx, module->tc_log_progress, module->ts_log_progress, + module->TxLogCondition, module->ThreadInit, module->ThreadDeinit); /* Not used with wild card loggers */ if (module->alproto != ALPROTO_UNKNOWN) { logger_bits[module->alproto] |= BIT_U32(module->logger_id);