logging: rename registration functions to not have tmm

As the logging modules are no longer threading modules, rename
them so they don't look like they are being registered as
threading modules.

Also, move the registration to the output.c which will handle
registration of the loggers.

diff --git a/src/alert-debuglog.c b/src/alert-debuglog.c
index 931fa70cba41ad1319037f8b94ce2d2d8e1459b5..1f2f5a4553e7ca30add151c2bf38f6a9757cd0ad 100644 (file)
--- a/src/alert-debuglog.c
+++ b/src/alert-debuglog.c
@@ -510,7 +510,7 @@ static int AlertDebugLogLogger(ThreadVars *tv, void *thread_data, const Packet *
     return TM_ECODE_OK;
 }
 
-void TmModuleAlertDebugLogRegister (void)
+void AlertDebugLogRegister(void)
 {
     OutputRegisterPacketModule(LOGGER_ALERT_DEBUG, MODULE_NAME, "alert-debug",
         AlertDebugLogInitCtx, AlertDebugLogLogger, AlertDebugLogCondition,

diff --git a/src/alert-debuglog.h b/src/alert-debuglog.h
index 8eb38d977c2a4e848e43738e58c27682adee2f33..f7c411c3ab3eeb888294b15070afcfad3c50c69a 100644 (file)
--- a/src/alert-debuglog.h
+++ b/src/alert-debuglog.h
@@ -24,7 +24,7 @@
 #ifndef __ALERT_DEBUGLOG_H__
 #define __ALERT_DEBUGLOG_H__
 
-void TmModuleAlertDebugLogRegister (void);
+void AlertDebugLogRegister(void);
 
 #endif /* __ALERT_DEBUGLOG_H__ */
 

diff --git a/src/alert-fastlog.c b/src/alert-fastlog.c
index 42d601997c27a061ed2b000cf5bf42768be78282..3fac2f66dfcd45be14d4943af51b73bbd8fc6ea9 100644 (file)
--- a/src/alert-fastlog.c
+++ b/src/alert-fastlog.c
@@ -76,7 +76,7 @@ static void AlertFastLogDeInitCtx(OutputCtx *);
 int AlertFastLogCondition(ThreadVars *tv, const Packet *p);
 int AlertFastLogger(ThreadVars *tv, void *data, const Packet *p);
 
-void TmModuleAlertFastLogRegister (void)
+void AlertFastLogRegister(void)
 {
     OutputRegisterPacketModule(LOGGER_ALERT_FAST, MODULE_NAME, "fast",
         AlertFastLogInitCtx, AlertFastLogger, AlertFastLogCondition,

diff --git a/src/alert-fastlog.h b/src/alert-fastlog.h
index ac3c45a7cf9da38ad80a4d21d0e4f035a96240a4..96bd0118abc95111993e7234575b44b9df9dbe15 100644 (file)
--- a/src/alert-fastlog.h
+++ b/src/alert-fastlog.h
@@ -24,7 +24,7 @@
 #ifndef __ALERT_FASTLOG_H__
 #define __ALERT_FASTLOG_H__
 
-void TmModuleAlertFastLogRegister(void);
+void AlertFastLogRegister(void);
 void TmModuleAlertFastLogIPv4Register(void);
 void TmModuleAlertFastLogIPv6Register(void);
 OutputCtx *AlertFastLogInitCtx(ConfNode *);

diff --git a/src/alert-prelude.c b/src/alert-prelude.c
index 399641015581afe749c696fd0b3691623e1295d3..8fd9b7ba64da5e2a9a7f6d84cca9053f0c1c14b9 100644 (file)
--- a/src/alert-prelude.c
+++ b/src/alert-prelude.c
@@ -62,7 +62,7 @@
 
 /* Handle the case where no PRELUDE support is compiled in. */
 
-void TmModuleAlertPreludeRegister (void)
+void AlertPreludeRegister(void)
 {
     SCLogDebug("Can't register Prelude output thread - Prelude support was disabled during build.");
 }
@@ -914,7 +914,7 @@ err:
     SCReturnInt(TM_ECODE_FAILED);
 }
 
-void TmModuleAlertPreludeRegister (void)
+void AlertPreludeRegister (void)
 {
     OutputRegisterPacketModule(LOGGER_PRELUDE, "AlertPrelude", "alert-prelude",
         AlertPreludeInitCtx, AlertPreludeLogger, AlertPreludeCondition,

diff --git a/src/alert-prelude.h b/src/alert-prelude.h
index 7a30e847ea1f3aa751ce77746903c4b307c9df71..0f15961f091f544837ec31dbd34be409016444c0 100644 (file)
--- a/src/alert-prelude.h
+++ b/src/alert-prelude.h
@@ -26,6 +26,6 @@
 #ifndef __ALERT_PRELUDE_H__
 #define __ALERT_PRELUDE_H__
 
-void TmModuleAlertPreludeRegister (void);
+void AlertPreludeRegister(void);
 
 #endif /* __ALERT_PRELUDE_H__ */

diff --git a/src/alert-syslog.c b/src/alert-syslog.c
index 3d312c9a01d25f4c9ef1005eddb420e3d9c131f7..869e33acf361f5c4c5a3be2d30b0aaec7c699adf 100644 (file)
--- a/src/alert-syslog.c
+++ b/src/alert-syslog.c
@@ -408,7 +408,7 @@ static int AlertSyslogLogger(ThreadVars *tv, void *thread_data, const Packet *p)
 #endif /* !OS_WIN32 */
 
 /** \brief   Function to register the AlertSyslog module */
-void TmModuleAlertSyslogRegister (void)
+void AlertSyslogRegister (void)
 {
 #ifndef OS_WIN32
     OutputRegisterPacketModule(LOGGER_ALERT_SYSLOG, MODULE_NAME, "syslog",

diff --git a/src/alert-syslog.h b/src/alert-syslog.h
index 976a1122eff7f1ff78426cee9b0d9826afeedfd1..06890469fcfcebcfc312dec7ccb0554fa6766c3e 100644 (file)
--- a/src/alert-syslog.h
+++ b/src/alert-syslog.h
@@ -27,7 +27,7 @@
 #ifndef __ALERT_SYSLOG_H__
 #define __ALERT_SYSLOG_H__
 
-void TmModuleAlertSyslogRegister(void);
+void AlertSyslogRegister(void);
 
 #endif /* __ALERT_SYSLOG_H__ */
 

diff --git a/src/alert-unified2-alert.c b/src/alert-unified2-alert.c
index a39a328c5eff95566041917fd80263b3471f87ff..be0998edfc5c0395add6c1f105e6ecea70479ec6 100644 (file)
--- a/src/alert-unified2-alert.c
+++ b/src/alert-unified2-alert.c
@@ -233,7 +233,7 @@ int Unified2Logger(ThreadVars *tv, void *data, const Packet *p);
 
 #define MODULE_NAME "Unified2Alert"
 
-void TmModuleUnified2AlertRegister(void)
+void Unified2AlertRegister(void)
 {
     OutputRegisterPacketModule(LOGGER_UNIFIED2, MODULE_NAME, "unified2-alert",
         Unified2AlertInitCtx, Unified2Logger, Unified2Condition,

diff --git a/src/alert-unified2-alert.h b/src/alert-unified2-alert.h
index d4d3b2ec153640732fa94d5eb14fdf46f72091fb..ae068a1d4e89c55b29e060ba8956ffb40b0949e7 100644 (file)
--- a/src/alert-unified2-alert.h
+++ b/src/alert-unified2-alert.h
@@ -43,7 +43,7 @@
 #define UNIFIED2_EXTRADATA_TYPE_BLOB 1
 #define UNIFIED2_EXTRADATA_TYPE_EXTRA_DATA 4
 
-void TmModuleUnified2AlertRegister(void);
+void Unified2AlertRegister(void);
 OutputCtx *Unified2AlertInitCtx(ConfNode *);
 
 #endif /* __ALERT_UNIFIED2_ALERT_H__ */

diff --git a/src/log-dnslog.c b/src/log-dnslog.c
index 418b2dd47926f65db1d915106c80707f8de314a7..51d524a59fcbc05a20fae2cc13e80bc86de32556 100644 (file)
--- a/src/log-dnslog.c
+++ b/src/log-dnslog.c
@@ -344,7 +344,7 @@ static OutputCtx *LogDnsLogInitCtx(ConfNode *conf)
     return output_ctx;
 }
 
-void TmModuleLogDnsLogRegister (void)
+void LogDnsLogRegister (void)
 {
     OutputRegisterTxModule(LOGGER_DNS, MODULE_NAME, "dns-log", LogDnsLogInitCtx,
         ALPROTO_DNS, LogDnsLogger, LogDnsLogThreadInit, LogDnsLogThreadDeinit,

diff --git a/src/log-dnslog.h b/src/log-dnslog.h
index acd00bc40285f05a926856c9fcbd8103b9374c66..eefac42248f872f87790eb4b8cf8056c17a07db6 100644 (file)
--- a/src/log-dnslog.h
+++ b/src/log-dnslog.h
@@ -24,6 +24,6 @@
 #ifndef __LOG_DNSLOG_H__
 #define __LOG_DNSLOG_H__
 
-void TmModuleLogDnsLogRegister (void);
+void LogDnsLogRegister(void);
 
 #endif /* __LOG_DNSLOG_H__ */

diff --git a/src/log-droplog.c b/src/log-droplog.c
index 03c66c620f4c95064375a8e15e52b58ffbeee2f8..ea0158388aa542d41d57a242217905e756660bf0 100644 (file)
--- a/src/log-droplog.c
+++ b/src/log-droplog.c
@@ -492,7 +492,7 @@ static void LogDropLogRegisterTests(void)
 #endif
 
 /** \brief function to register the drop log module */
-void TmModuleLogDropLogRegister (void)
+void LogDropLogRegister (void)
 {
     OutputRegisterPacketModule(LOGGER_DROP, MODULE_NAME, "drop",
         LogDropLogInitCtx, LogDropLogger, LogDropCondition,

diff --git a/src/log-droplog.h b/src/log-droplog.h
index 2b266ad55c3706a1fc3e2f71fd7bdde64ac93849..e37d8e73f9896c047d003d3b19a0d766ae66f541 100644 (file)
--- a/src/log-droplog.h
+++ b/src/log-droplog.h
@@ -26,6 +26,6 @@
 #ifndef ALERT_DROPLOG_H
 #define        ALERT_DROPLOG_H
 
-void TmModuleLogDropLogRegister(void);
+void LogDropLogRegister(void);
 
 #endif /* ALERT_DROPLOG_H */

diff --git a/src/log-file.c b/src/log-file.c
index 71e683a420715e8a0c50384804300d6850f0cd37..1b594c5909fe6edb4e4eb67ea419a10fa7d21ac2 100644 (file)
--- a/src/log-file.c
+++ b/src/log-file.c
@@ -453,7 +453,7 @@ int LogFileLogOpenFileCtx(LogFileCtx *file_ctx, const char *filename, const
     return 0;
 }
 
-void TmModuleLogFileLogRegister (void)
+void LogFileLogRegister (void)
 {
     OutputRegisterFileModule(LOGGER_FILE, MODULE_NAME, "file-log",
         LogFileLogInitCtx, LogFileLogger, LogFileLogThreadInit,

diff --git a/src/log-file.h b/src/log-file.h
index 08e0785b21e431b21503e46d926a9fd7b555f267..b856204bd68827f504d2a7f4603f3657f7c755f1 100644 (file)
--- a/src/log-file.h
+++ b/src/log-file.h
@@ -24,6 +24,6 @@
 #ifndef __LOG_FILELOG_H__
 #define __LOG_FILELOG_H__
 
-void TmModuleLogFileLogRegister (void);
+void LogFileLogRegister(void);
 
 #endif /* __LOG_FILELOG_H__ */

diff --git a/src/log-filestore.c b/src/log-filestore.c
index aacd219433c6146163cbeff048570d487c4913a8..99fa7e38d9b99647130d7c23057bd121e439a0ce 100644 (file)
--- a/src/log-filestore.c
+++ b/src/log-filestore.c
@@ -479,7 +479,7 @@ static OutputCtx *LogFilestoreLogInitCtx(ConfNode *conf)
     SCReturnPtr(output_ctx, "OutputCtx");
 }
 
-void TmModuleLogFilestoreRegister (void)
+void LogFilestoreRegister (void)
 {
     OutputRegisterFiledataModule(LOGGER_FILE_STORE, MODULE_NAME, "file",
         LogFilestoreLogInitCtx, LogFilestoreLogger, LogFilestoreLogThreadInit,

diff --git a/src/log-filestore.h b/src/log-filestore.h
index bfbfd5fcfa85120d0af2b931f4528371d86273d2..d477506fc590338a370a1cf4e84582fc91404fc4 100644 (file)
--- a/src/log-filestore.h
+++ b/src/log-filestore.h
@@ -24,6 +24,6 @@
 #ifndef __LOG_FILESTORE_H__
 #define __LOG_FILESTORE_H__
 
-void TmModuleLogFilestoreRegister (void);
+void LogFilestoreRegister(void);
 
 #endif /* __LOG_FILELOG_H__ */

diff --git a/src/log-httplog.c b/src/log-httplog.c
index 695b98e53897eca9e5f68619fac392b88ce16761..775fec636e92431f56d711b3a05c40580f247466 100644 (file)
--- a/src/log-httplog.c
+++ b/src/log-httplog.c
@@ -63,7 +63,7 @@ static void LogHttpLogDeInitCtx(OutputCtx *);
 
 int LogHttpLogger(ThreadVars *tv, void *thread_data, const Packet *, Flow *f, void *state, void *tx, uint64_t tx_id);
 
-void TmModuleLogHttpLogRegister (void)
+void LogHttpLogRegister (void)
 {
     OutputRegisterTxModule(LOGGER_HTTP, MODULE_NAME, "http-log",
         LogHttpLogInitCtx, ALPROTO_HTTP, LogHttpLogger, LogHttpLogThreadInit,

diff --git a/src/log-httplog.h b/src/log-httplog.h
index c02d0d9d612bf7408aa1c34c90892858aaa7afcc..e8fccb65dab4797fd0e533a7ee000a666e8819f7 100644 (file)
--- a/src/log-httplog.h
+++ b/src/log-httplog.h
@@ -24,7 +24,7 @@
 #ifndef __LOG_HTTPLOG_H__
 #define __LOG_HTTPLOG_H__
 
-void TmModuleLogHttpLogRegister (void);
+void LogHttpLogRegister(void);
 void TmModuleLogHttpLogIPv4Register (void);
 void TmModuleLogHttpLogIPv6Register (void);
 OutputCtx *LogHttpLogInitCtx(ConfNode *);

diff --git a/src/log-pcap.c b/src/log-pcap.c
index 4ff1b4d5c94ca6fcf2f3e90318d8474c1b5dffd6..258e483ece2351c4abf69a2e32e610f5fb493d72 100644 (file)
--- a/src/log-pcap.c
+++ b/src/log-pcap.c
@@ -151,12 +151,12 @@ static OutputCtx *PcapLogInitCtx(ConfNode *);
 static void PcapLogProfilingDump(PcapLogData *);
 static int PcapLogCondition(ThreadVars *, const Packet *);
 
-void TmModulePcapLogRegister(void)
+void PcapLogRegister(void)
 {
     OutputRegisterPacketModule(LOGGER_PCAP, MODULE_NAME, "pcap-log",
         PcapLogInitCtx, PcapLog, PcapLogCondition, PcapLogDataInit,
         PcapLogDataDeinit, NULL);
-
+    PcapLogProfileSetup();
     SC_ATOMIC_INIT(thread_cnt);
     return;
 }

diff --git a/src/log-pcap.h b/src/log-pcap.h
index 0c6e7011bade97110cf91980a647abefef484f6a..8b68d433292937f52d49c4e9a967f0f0bc37b518 100644 (file)
--- a/src/log-pcap.h
+++ b/src/log-pcap.h
@@ -28,7 +28,7 @@
 #ifndef __LOG_PCAP_H__
 #define __LOG_PCAP_H__
 
-void TmModulePcapLogRegister (void);
+void PcapLogRegister(void);
 void PcapLogProfileSetup(void);
 
 #endif /* __LOG_PCAP_H__ */

diff --git a/src/log-stats.c b/src/log-stats.c
index 343fce06ae6fc11bbc718375face98e6a6bebd41..e82e1edb0ff5a14e33e0b1e6683a01560989c3b6 100644 (file)
--- a/src/log-stats.c
+++ b/src/log-stats.c
@@ -294,7 +294,7 @@ static void LogStatsLogDeInitCtx(OutputCtx *output_ctx)
     SCFree(output_ctx);
 }
 
-void TmModuleLogStatsLogRegister (void)
+void LogStatsLogRegister (void)
 {
     OutputRegisterStatsModule(LOGGER_STATS, MODULE_NAME, "stats",
         LogStatsLogInitCtx, LogStatsLogger, LogStatsLogThreadInit,

diff --git a/src/log-stats.h b/src/log-stats.h
index 957104f3c7fc1b74ff012e9c842c0c37827ae9d1..f7f536c6ddb04e0d57b5f45bbb50912f1d6fa529 100644 (file)
--- a/src/log-stats.h
+++ b/src/log-stats.h
@@ -24,6 +24,6 @@
 #ifndef __LOG_STATS_H__
 #define __LOG_STATS_H__
 
-void TmModuleLogStatsLogRegister (void);
+void LogStatsLogRegister(void);
 
 #endif /* __LOG_HTTPLOG_H__ */

diff --git a/src/log-tcp-data.c b/src/log-tcp-data.c
index d56a9fc5889d30af92dda3114ca9902f8ec89c56..3a791a55dcef7e2caf96535e61dbfee19037f4eb 100644 (file)
--- a/src/log-tcp-data.c
+++ b/src/log-tcp-data.c
@@ -60,7 +60,7 @@ static void LogTcpDataLogDeInitCtx(OutputCtx *);
 
 int LogTcpDataLogger(ThreadVars *tv, void *thread_data, const Flow *f, const uint8_t *data, uint32_t data_len, uint64_t tx_id, uint8_t flags);
 
-void TmModuleLogTcpDataLogRegister (void) {
+void LogTcpDataLogRegister (void) {
     OutputRegisterStreamingModule(LOGGER_TCP_DATA, MODULE_NAME, "tcp-data",
         LogTcpDataLogInitCtx, LogTcpDataLogger, STREAMING_TCP_DATA,
         LogTcpDataLogThreadInit, LogTcpDataLogThreadDeinit,

diff --git a/src/log-tcp-data.h b/src/log-tcp-data.h
index 5123c3b2dda577727d814a70459a81cfa82362d0..fcfe19442b598cd63072d3b21a5826bc9a7585d7 100644 (file)
--- a/src/log-tcp-data.h
+++ b/src/log-tcp-data.h
@@ -24,7 +24,7 @@
 #ifndef __LOG_TCPDATALOG_H__
 #define __LOG_TCPDATALOG_H__
 
-void TmModuleLogTcpDataLogRegister (void);
+void LogTcpDataLogRegister(void);
 OutputCtx *LogTcpDataLogInitCtx(ConfNode *);
 
 #endif /* __LOG_TCPDATALOG_H__ */

diff --git a/src/log-tlslog.c b/src/log-tlslog.c
index aa04ad11054a35d4a0426e196cbd89352844933d..ff7935ae5d95b64d1ebd765868471e06c6ace894 100644 (file)
--- a/src/log-tlslog.c
+++ b/src/log-tlslog.c
@@ -312,7 +312,7 @@ static int LogTlsLogger(ThreadVars *tv, void *thread_data, const Packet *p,
     return 0;
 }
 
-void TmModuleLogTlsLogRegister(void)
+void LogTlsLogRegister(void)
 {
     OutputRegisterTxModuleWithProgress(LOGGER_TLS, MODULE_NAME, "tls-log",
         LogTlsLogInitCtx, ALPROTO_TLS, LogTlsLogger, TLS_HANDSHAKE_DONE,

diff --git a/src/log-tlslog.h b/src/log-tlslog.h
index d3c9ce516b86c179c3eb223c215f5d443cefb7b3..87c2fbcf5db762663e066bf582d31bbcd91e6bbd 100644 (file)
--- a/src/log-tlslog.h
+++ b/src/log-tlslog.h
@@ -25,7 +25,7 @@
 #ifndef __LOG_TLSLOG_H__
 #define __LOG_TLSLOG_H__
 
-void TmModuleLogTlsLogRegister (void);
+void LogTlsLogRegister(void);
 
 int TLSGetIPInformations(const Packet *p, char* srcip, size_t srcip_len,
                              Port* sp, char* dstip, size_t dstip_len,

diff --git a/src/log-tlsstore.c b/src/log-tlsstore.c
index 13840af1ec30e9dd5f3933d805a14ad08774fd72..ddabd41fa377481f06e092df7a2f7f7b6a7a3993 100644 (file)
--- a/src/log-tlsstore.c
+++ b/src/log-tlsstore.c
@@ -406,7 +406,7 @@ static OutputCtx *LogTlsStoreLogInitCtx(ConfNode *conf)
     SCReturnPtr(output_ctx, "OutputCtx");
 }
 
-void TmModuleLogTlsStoreRegister (void)
+void LogTlsStoreRegister (void)
 {
     OutputRegisterTxModuleWithCondition(LOGGER_TLS_STORE, MODULE_NAME,
         "tls-store", LogTlsStoreLogInitCtx, ALPROTO_TLS, LogTlsStoreLogger,

diff --git a/src/log-tlsstore.h b/src/log-tlsstore.h
index 6cbacab6476019653443ce2c9727bc35f13bc1d5..c80975bee132bd205cd5177a9041ac6b1864baba 100644 (file)
--- a/src/log-tlsstore.h
+++ b/src/log-tlsstore.h
@@ -24,6 +24,6 @@
 #ifndef __LOG_TLSSTORE_H__
 #define __LOG_TLSSTORE_H__
 
-void TmModuleLogTlsStoreRegister (void);
+void LogTlsStoreRegister(void);
 
 #endif /* __LOG_TLSSTORE_H__ */

diff --git a/src/output-file.c b/src/output-file.c
index 2e23b2a38753ddb439c88d41ab405fa174f1e669..78b9df38f2df2248d65058e4d9955fba1cef3018 100644 (file)
--- a/src/output-file.c
+++ b/src/output-file.c
@@ -266,7 +266,7 @@ static void OutputFileLogExitPrintStats(ThreadVars *tv, void *thread_data)
     }
 }
 
-void TmModuleFileLoggerRegister (void)
+void OutputFileLoggerRegister(void)
 {
     OutputRegisterRootLogger(OutputFileLogThreadInit,
         OutputFileLogThreadDeinit, OutputFileLogExitPrintStats, OutputFileLog);

diff --git a/src/output-file.h b/src/output-file.h
index 3f335447dafea6453bb385d7d37751f7367682ee..d27d26eec47f0d83c99c59ce6d698bdf7cbc6143 100644 (file)
--- a/src/output-file.h
+++ b/src/output-file.h
@@ -41,7 +41,7 @@ int OutputRegisterFileLogger(LoggerId id, const char *name, FileLogger LogFunc,
     OutputCtx *, ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit,
     ThreadExitPrintStatsFunc ThreadExitPrintStats);
 
-void TmModuleFileLoggerRegister (void);
+void OutputFileLoggerRegister(void);
 
 void OutputFileShutdown(void);
 

diff --git a/src/output-filedata.c b/src/output-filedata.c
index 66a66208eca0c9c46b94d7dda24099fa508ccae7..7b7ea20a237d4590106124ab7b75ef6b8b9fbacc 100644 (file)
--- a/src/output-filedata.c
+++ b/src/output-filedata.c
@@ -434,7 +434,7 @@ static void OutputFiledataLogExitPrintStats(ThreadVars *tv, void *thread_data)
     }
 }
 
-void TmModuleFiledataLoggerRegister (void)
+void OutputFiledataLoggerRegister(void)
 {
     OutputRegisterRootLogger(OutputFiledataLogThreadInit,
         OutputFiledataLogThreadDeinit, OutputFiledataLogExitPrintStats,

diff --git a/src/output-filedata.h b/src/output-filedata.h
index 562eba6bb0fc5ea1160c5bc5f8824abfd21da069..4c661b2de1cc8b1fc7de71482d880bcbdeb3ac9b 100644 (file)
--- a/src/output-filedata.h
+++ b/src/output-filedata.h
@@ -46,7 +46,7 @@ int OutputRegisterFiledataLogger(LoggerId id, const char *name,
     ThreadDeinitFunc ThreadDeinit,
     ThreadExitPrintStatsFunc ThreadExitPrintStats);
 
-void TmModuleFiledataLoggerRegister (void);
+void OutputFiledataLoggerRegister(void);
 
 void OutputFiledataShutdown(void);
 

diff --git a/src/output-json-alert.c b/src/output-json-alert.c
index ac28c6c9d695cd97a7d7a3b0320965208e5525d7..0de310b58e5e93b1a59bda74605d42930f0c5540 100644 (file)
--- a/src/output-json-alert.c
+++ b/src/output-json-alert.c
@@ -739,7 +739,7 @@ error:
     return NULL;
 }
 
-void TmModuleJsonAlertLogRegister (void)
+void JsonAlertLogRegister (void)
 {
     OutputRegisterPacketModule(LOGGER_JSON_ALERT, MODULE_NAME, "alert-json-log",
         JsonAlertLogInitCtx, JsonAlertLogger, JsonAlertLogCondition,
@@ -752,7 +752,7 @@ void TmModuleJsonAlertLogRegister (void)
 
 #else
 
-void TmModuleJsonAlertLogRegister (void)
+void JsonAlertLogRegister (void)
 {
     SCLogInfo("Can't register JSON output - JSON support was disabled during build.");
 }

diff --git a/src/output-json-alert.h b/src/output-json-alert.h
index a10a316d20b3a1375313bdbffd078050d55336f2..645b6f5c02704c24cf9ade35d1ce9a76cd99f6bd 100644 (file)
--- a/src/output-json-alert.h
+++ b/src/output-json-alert.h
@@ -27,7 +27,7 @@
 #ifndef __OUTPUT_JSON_ALERT_H__
 #define __OUTPUT_JSON_ALERT_H__
 
-void TmModuleJsonAlertLogRegister (void);
+void JsonAlertLogRegister(void);
 #ifdef HAVE_LIBJANSSON
 void AlertJsonHeader(const Packet *p, const PacketAlert *pa, json_t *js);
 #endif /* HAVE_LIBJANSSON */

diff --git a/src/output-json-dns.c b/src/output-json-dns.c
index 8d0e8e76eddca2d10de76182b2f862d4c1026397..f55d6d5461733f15ce20d5c7ce04ffaf25786ad3 100644 (file)
--- a/src/output-json-dns.c
+++ b/src/output-json-dns.c
@@ -849,7 +849,7 @@ static OutputCtx *JsonDnsLogInitCtx(ConfNode *conf)
 
 
 #define MODULE_NAME "JsonDnsLog"
-void TmModuleJsonDnsLogRegister (void)
+void JsonDnsLogRegister (void)
 {
     /* Logger for requests. */
     OutputRegisterTxModuleWithProgress(LOGGER_JSON_DNS, MODULE_NAME,
@@ -876,7 +876,7 @@ void TmModuleJsonDnsLogRegister (void)
 
 #else
 
-void TmModuleJsonDnsLogRegister (void)
+void JsonDnsLogRegister (void)
 {
     SCLogInfo("Can't register JSON output - JSON support was disabled during build.");
 }

diff --git a/src/output-json-dns.h b/src/output-json-dns.h
index f26227e374807dee97a07d5f5a3cf7a76ec79e66..9c3e88011578daf2230fc5f661f8fcb0e6922f10 100644 (file)
--- a/src/output-json-dns.h
+++ b/src/output-json-dns.h
@@ -24,6 +24,6 @@
 #ifndef __OUTPUT_JSON_DNS_H__
 #define __OUTPUT_JSON_DNS_H__
 
-void TmModuleJsonDnsLogRegister (void);
+void JsonDnsLogRegister(void);
 
 #endif /* __OUTPUT_JSON_DNS_H__ */

diff --git a/src/output-json-drop.c b/src/output-json-drop.c
index fa2c7de00836469fdb33366fa9f33bfda8ab0b63..8ae8c4297ac071030b7d932b6a3c270d3b0120b6 100644 (file)
--- a/src/output-json-drop.c
+++ b/src/output-json-drop.c
@@ -427,7 +427,7 @@ static int JsonDropLogCondition(ThreadVars *tv, const Packet *p)
     return FALSE;
 }
 
-void TmModuleJsonDropLogRegister (void)
+void JsonDropLogRegister (void)
 {
     OutputRegisterPacketModule(LOGGER_JSON_DROP, MODULE_NAME, "drop-json-log",
         JsonDropLogInitCtx, JsonDropLogger, JsonDropLogCondition,
@@ -440,7 +440,7 @@ void TmModuleJsonDropLogRegister (void)
 
 #else
 
-void TmModuleJsonDropLogRegister (void)
+void JsonDropLogRegister (void)
 {
     SCLogInfo("Can't register JSON output - JSON support was disabled during build.");
 }

diff --git a/src/output-json-drop.h b/src/output-json-drop.h
index c02057c14cbbf74872a3277c5c3c2ac31757397c..d4fc9a16283c38db1f91b2badf503f2c2bb84afe 100644 (file)
--- a/src/output-json-drop.h
+++ b/src/output-json-drop.h
@@ -25,6 +25,6 @@
 #ifndef __OUTPUT_JSON_DROP_H__
 #define __OUTPUT_JSON_DROP_H__
 
-void TmModuleJsonDropLogRegister (void);
+void JsonDropLogRegister(void);
 
 #endif /* __OUTPUT_DROPLOG_H__ */

diff --git a/src/output-json-file.c b/src/output-json-file.c
index 6e1ad571ff0696b9c7d3f318162c6fe581732f32..dfc034bdc7588d0b82eaeefea14225aa0c57e470 100644 (file)
--- a/src/output-json-file.c
+++ b/src/output-json-file.c
@@ -288,7 +288,7 @@ OutputCtx *OutputFileLogInitSub(ConfNode *conf, OutputCtx *parent_ctx)
     return output_ctx;
 }
 
-void TmModuleJsonFileLogRegister (void)
+void JsonFileLogRegister (void)
 {
     /* register as child of eve-log */
     OutputRegisterFileSubModule(LOGGER_JSON_FILE, "eve-log", "JsonFileLog",
@@ -298,7 +298,7 @@ void TmModuleJsonFileLogRegister (void)
 
 #else
 
-void TmModuleJsonFileLogRegister (void)
+void JsonFileLogRegister (void)
 {
     SCLogInfo("Can't register JSON output - JSON support was disabled during build.");
 }

diff --git a/src/output-json-file.h b/src/output-json-file.h
index e101897f7bf278172b98b12b217a1af6e1a31bee..680724f6cbb51846570a2a534174369ac2a93816 100644 (file)
--- a/src/output-json-file.h
+++ b/src/output-json-file.h
@@ -24,6 +24,6 @@
 #ifndef __OUTPUT_JSON_FILE_H__
 #define __OUTPUT_JSON_FILE_H__
 
-void TmModuleJsonFileLogRegister (void);
+void JsonFileLogRegister(void);
 
 #endif /* __OUTPUT_JSON_FILE_H__ */

diff --git a/src/output-json-flow.c b/src/output-json-flow.c
index 3a5902779305c79c4c9e739a47bdfabdc481a4cd..2d0f76acfe65c0db2b273a14aa6f3a278efea022 100644 (file)
--- a/src/output-json-flow.c
+++ b/src/output-json-flow.c
@@ -448,7 +448,7 @@ static TmEcode JsonFlowLogThreadDeinit(ThreadVars *t, void *data)
     return TM_ECODE_OK;
 }
 
-void TmModuleJsonFlowLogRegister (void)
+void JsonFlowLogRegister (void)
 {
     /* register as separate module */
     OutputRegisterFlowModule(LOGGER_JSON_FLOW, "JsonFlowLog", "flow-json-log",
@@ -463,7 +463,7 @@ void TmModuleJsonFlowLogRegister (void)
 
 #else
 
-void TmModuleJsonFlowLogRegister (void)
+void JsonFlowLogRegister (void)
 {
     SCLogInfo("Can't register JSON output - JSON support was disabled during build.");
 }

diff --git a/src/output-json-flow.h b/src/output-json-flow.h
index 1d32c9eb68128455a51b13058f41be79f0ccc7f8..439af93857044f77e4c3fae6348882370faf52ff 100644 (file)
--- a/src/output-json-flow.h
+++ b/src/output-json-flow.h
@@ -24,6 +24,6 @@
 #ifndef __OUTPUT_JSON_FLOW_H__
 #define __OUTPUT_JSON_FLOW_H__
 
-void TmModuleJsonFlowLogRegister (void);
+void JsonFlowLogRegister(void);
 
 #endif /* __OUTPUT_JSON_FLOW_H__ */

diff --git a/src/output-json-http.c b/src/output-json-http.c
index 9075e0cce335f3137eed95a72df47a03f063b242..381ddeb4c4ab200af969b006f3687db448696894 100644 (file)
--- a/src/output-json-http.c
+++ b/src/output-json-http.c
@@ -582,7 +582,7 @@ static TmEcode JsonHttpLogThreadDeinit(ThreadVars *t, void *data)
     return TM_ECODE_OK;
 }
 
-void TmModuleJsonHttpLogRegister (void)
+void JsonHttpLogRegister (void)
 {
     /* register as separate module */
     OutputRegisterTxModule(LOGGER_JSON_HTTP, "JsonHttpLog", "http-json-log",
@@ -597,7 +597,7 @@ void TmModuleJsonHttpLogRegister (void)
 
 #else
 
-void TmModuleJsonHttpLogRegister (void)
+void JsonHttpLogRegister (void)
 {
     SCLogInfo("Can't register JSON output - JSON support was disabled during build.");
 }

diff --git a/src/output-json-http.h b/src/output-json-http.h
index 0c886f3dd56dd944bc6502d7337b2c364e658ac0..eda68c2acc7569a8b51823b94e5cc5d7ad2402f8 100644 (file)
--- a/src/output-json-http.h
+++ b/src/output-json-http.h
@@ -24,7 +24,7 @@
 #ifndef __OUTPUT_JSON_HTTP_H__
 #define __OUTPUT_JSON_HTTP_H__
 
-void TmModuleJsonHttpLogRegister (void);
+void JsonHttpLogRegister(void);
 
 #ifdef HAVE_LIBJANSSON
 void JsonHttpLogJSONBasic(json_t *js, htp_tx_t *tx);

diff --git a/src/output-json-netflow.c b/src/output-json-netflow.c
index 0ac1683a856c90203e6decfd34f74b4c42794a6f..fb39d219e4674e19cf11a6f100efcba3b4b8abc4 100644 (file)
--- a/src/output-json-netflow.c
+++ b/src/output-json-netflow.c
@@ -430,7 +430,7 @@ static TmEcode JsonNetFlowLogThreadDeinit(ThreadVars *t, void *data)
     return TM_ECODE_OK;
 }
 
-void TmModuleJsonNetFlowLogRegister (void)
+void JsonNetFlowLogRegister(void)
 {
     /* register as separate module */
     OutputRegisterFlowModule(LOGGER_JSON_NETFLOW, "JsonNetFlowLog",
@@ -445,7 +445,7 @@ void TmModuleJsonNetFlowLogRegister (void)
 
 #else
 
-void TmModuleJsonNetFlowLogRegister (void)
+void JsonNetFlowLogRegister (void)
 {
     SCLogInfo("Can't register JSON output - JSON support was disabled during build.");
 }

diff --git a/src/output-json-netflow.h b/src/output-json-netflow.h
index 361cc3a0f347963bae6e83eebc7a725ab86659c0..738c497fd8305447665eb2a23845d013302d0328 100644 (file)
--- a/src/output-json-netflow.h
+++ b/src/output-json-netflow.h
@@ -24,6 +24,6 @@
 #ifndef __OUTPUT_JSON_NETFLOW_H__
 #define __OUTPUT_JSON_NETFLOW_H__
 
-void TmModuleJsonNetFlowLogRegister (void);
+void JsonNetFlowLogRegister(void);
 
 #endif /* __OUTPUT_JSON_FLOW_H__ */

diff --git a/src/output-json-smtp.c b/src/output-json-smtp.c
index 456f2c6af0667c05e74d053ac7fec42e5c719946..368e917c280b96db114396edd189aed6c583d32f 100644 (file)
--- a/src/output-json-smtp.c
+++ b/src/output-json-smtp.c
@@ -257,7 +257,7 @@ static TmEcode JsonSmtpLogThreadDeinit(ThreadVars *t, void *data)
     return TM_ECODE_OK;
 }
 
-void TmModuleJsonSmtpLogRegister (void) {
+void JsonSmtpLogRegister (void) {
     /* register as separate module */
     OutputRegisterTxModule(LOGGER_JSON_SMTP, "JsonSmtpLog", "smtp-json-log",
         OutputSmtpLogInit, ALPROTO_SMTP, JsonSmtpLogger, JsonSmtpLogThreadInit,
@@ -271,7 +271,7 @@ void TmModuleJsonSmtpLogRegister (void) {
 
 #else
 
-void TmModuleJsonSmtpLogRegister (void)
+void JsonSmtpLogRegister (void)
 {
     SCLogInfo("Can't register JSON output - JSON support was disabled during build.");
 }

diff --git a/src/output-json-smtp.h b/src/output-json-smtp.h
index 2f79d992011a4477ebc0ca5afd862d785fbba16a..24d3f8c22de850c4b0458b14d02350d3ed2b8063 100644 (file)
--- a/src/output-json-smtp.h
+++ b/src/output-json-smtp.h
@@ -24,7 +24,7 @@
 #ifndef __OUTPUT_JSON_SMTP_H__
 #define __OUTPUT_JSON_SMTP_H__
 
-void TmModuleJsonSmtpLogRegister (void);
+void JsonSmtpLogRegister(void);
 #ifdef HAVE_LIBJANSSON
 json_t *JsonSMTPAddMetadata(const Flow *f, uint64_t tx_id);
 #endif

diff --git a/src/output-json-ssh.c b/src/output-json-ssh.c
index deec854acd0c71d2a378a559b9ed957d4573ff0e..e8178f3152d678aa68ebe88c561d49967334e219 100644 (file)
--- a/src/output-json-ssh.c
+++ b/src/output-json-ssh.c
@@ -314,7 +314,7 @@ dontlog:
     return FALSE;
 }
 
-void TmModuleJsonSshLogRegister (void)
+void JsonSshLogRegister (void)
 {
     /* register as separate module */
     OutputRegisterPacketModule(LOGGER_JSON_SSH, "JsonSshLog", "ssh-json-log",
@@ -329,7 +329,7 @@ void TmModuleJsonSshLogRegister (void)
 
 #else
 
-void TmModuleJsonSshLogRegister (void)
+void JsonSshLogRegister (void)
 {
     SCLogInfo("Can't register JSON output - JSON support was disabled during build.");
 }

diff --git a/src/output-json-ssh.h b/src/output-json-ssh.h
index 5d0752bf2a53299575eda0ce0d25bb3a69e041cc..68a7f974c679a1fdc1dfbc674a31d0b7803741de 100644 (file)
--- a/src/output-json-ssh.h
+++ b/src/output-json-ssh.h
@@ -24,7 +24,7 @@
 #ifndef __OUTPUT_JSON_SSH_H__
 #define __OUTPUT_JSON_SSH_H__
 
-void TmModuleJsonSshLogRegister (void);
+void JsonSshLogRegister(void);
 
 #ifdef HAVE_LIBJANSSON
 #include "app-layer-ssh.h"

diff --git a/src/output-json-stats.c b/src/output-json-stats.c
index ec0fc4152dfe8e14ca257076de00d7b8c4f278e9..be1646a4456aecfc77946410c44e41c77972a019 100644 (file)
--- a/src/output-json-stats.c
+++ b/src/output-json-stats.c
@@ -371,7 +371,7 @@ OutputCtx *OutputStatsLogInitSub(ConfNode *conf, OutputCtx *parent_ctx)
     return output_ctx;
 }
 
-void TmModuleJsonStatsLogRegister (void) {
+void JsonStatsLogRegister(void) {
     /* register as separate module */
     OutputRegisterStatsModule(LOGGER_JSON_STATS, MODULE_NAME, "stats-json",
         OutputStatsLogInit, JsonStatsLogger, JsonStatsLogThreadInit,
@@ -385,7 +385,7 @@ void TmModuleJsonStatsLogRegister (void) {
 
 #else
 
-void TmModuleJsonStatsLogRegister (void)
+void JsonStatsLogRegister (void)
 {
     SCLogInfo("Can't register JSON output - JSON support was disabled during build.");
 }

diff --git a/src/output-json-stats.h b/src/output-json-stats.h
index ab1e6b55c014a5980c28c41d0865a6dcf6a7ee99..94962a3c99bbab737dfaa1af6d114589a04db7e0 100644 (file)
--- a/src/output-json-stats.h
+++ b/src/output-json-stats.h
@@ -33,6 +33,6 @@
 #ifdef HAVE_LIBJANSSON
 json_t *StatsToJSON(const StatsTable *st, uint8_t flags);
 #endif
-void TmModuleJsonStatsLogRegister (void);
+void JsonStatsLogRegister(void);
 
 #endif /* __OUTPUT_JSON_COUNTERS_H__ */

diff --git a/src/output-json-template.c b/src/output-json-template.c
index e877259de7ad8927031abc215fffc551cd0d4283..88e8ee7981fc71cbb0863fddb11810b0eaa96689 100644 (file)
--- a/src/output-json-template.c
+++ b/src/output-json-template.c
@@ -190,7 +190,7 @@ static TmEcode JsonTemplateLogThreadDeinit(ThreadVars *t, void *data)
     return TM_ECODE_OK;
 }
 
-void TmModuleJsonTemplateLogRegister(void)
+void JsonTemplateLogRegister(void)
 {
     /* TEMPLATE_START_REMOVE */
     if (ConfGetNode("app-layer.protocols.template") == NULL) {
@@ -208,7 +208,7 @@ void TmModuleJsonTemplateLogRegister(void)
 
 #else /* No JSON support. */
 
-void TmModuleJsonTemplateLogRegister(void)
+void JsonTemplateLogRegister(void)
 {
     SCLogInfo("Cannot register JSON output for template. "
         "JSON support was disabled during build.");

diff --git a/src/output-json-template.h b/src/output-json-template.h
index 4f1ac6b7afdd31edb31cdf9682500b3568da8f03..874df6b3b4a7cd4ff019ca6df7a41cf7d545d57f 100644 (file)
--- a/src/output-json-template.h
+++ b/src/output-json-template.h
@@ -24,6 +24,6 @@
 #ifndef __OUTPUT_JSON_TEMPLATE_H__
 #define __OUTPUT_JSON_TEMPLATE_H__
 
-void TmModuleJsonTemplateLogRegister(void);
+void JsonTemplateLogRegister(void);
 
 #endif /* __OUTPUT_JSON_TEMPLATE_H__ */

diff --git a/src/output-json-tls.c b/src/output-json-tls.c
index 18ea2cab9443a0d1c1ac7c3d97dbaaef712e4863..c7135031795e7db0b2d3e73212ae2ec185df29e4 100644 (file)
--- a/src/output-json-tls.c
+++ b/src/output-json-tls.c
@@ -308,7 +308,7 @@ OutputCtx *OutputTlsLogInitSub(ConfNode *conf, OutputCtx *parent_ctx)
     return output_ctx;
 }
 
-void TmModuleJsonTlsLogRegister (void)
+void JsonTlsLogRegister (void)
 {
     /* register as separate module */
     OutputRegisterTxModuleWithProgress(LOGGER_JSON_TLS, "JsonTlsLog",
@@ -325,7 +325,7 @@ void TmModuleJsonTlsLogRegister (void)
 
 #else
 
-void TmModuleJsonTlsLogRegister (void)
+void JsonTlsLogRegister (void)
 {
     SCLogInfo("Can't register JSON output - JSON support was disabled during build.");
 }

diff --git a/src/output-json-tls.h b/src/output-json-tls.h
index f330ad898aad2d138776493b7043ab4ce35527e7..06657c8e852c2a2afc930217b72ca85ab1aa3a95 100644 (file)
--- a/src/output-json-tls.h
+++ b/src/output-json-tls.h
@@ -24,7 +24,7 @@
 #ifndef __OUTPUT_JSON_TLS_H__
 #define __OUTPUT_JSON_TLS_H__
 
-void TmModuleJsonTlsLogRegister (void);
+void JsonTlsLogRegister(void);
 
 #ifdef HAVE_LIBJANSSON
 #include "app-layer-ssl.h"

diff --git a/src/output-json.c b/src/output-json.c
index 6a91cbd0fb4ae768280163ed2512e102e76e74b9..ccf43b692359d40066f7883b2a273d8eec44fe9f 100644 (file)
--- a/src/output-json.c
+++ b/src/output-json.c
@@ -67,7 +67,7 @@
 
 int OutputJsonOpenFileCtx(LogFileCtx *, char *);
 
-void TmModuleOutputJsonRegister (void)
+void OutputJsonRegister (void)
 {
     SCLogDebug("Can't register JSON output - JSON support was disabled during build.");
 }
@@ -84,7 +84,7 @@ void TmModuleOutputJsonRegister (void)
 
 static void OutputJsonDeInitCtx(OutputCtx *);
 
-void TmModuleOutputJsonRegister (void)
+void OutputJsonRegister (void)
 {
     OutputRegisterModule(MODULE_NAME, "eve-log", OutputJsonInitCtx);
 }

diff --git a/src/output-json.h b/src/output-json.h
index 7f43392664a419f5dce04612efa2a80569e36efd..bb7d94de9ee56c221f9ae273712a4382251427fc 100644 (file)
--- a/src/output-json.h
+++ b/src/output-json.h
@@ -28,7 +28,7 @@
 #include "util-buffer.h"
 #include "util-logopenfile.h"
 
-void TmModuleOutputJsonRegister (void);
+void OutputJsonRegister(void);
 
 #ifdef HAVE_LIBJANSSON
 /* helper struct for OutputJSONMemBufferCallback */

diff --git a/src/output-lua.c b/src/output-lua.c
index 7d3ae065e502c7caf47841669ab7868b307b810b..deed5d5bc9905fd2df9ba6d4c9edd3fdc32d7d1c 100644 (file)
--- a/src/output-lua.c
+++ b/src/output-lua.c
@@ -1000,14 +1000,14 @@ static TmEcode LuaLogThreadDeinit(ThreadVars *t, void *data)
     return TM_ECODE_OK;
 }
 
-void TmModuleLuaLogRegister (void) {
+void LuaLogRegister(void) {
     /* register as separate module */
     OutputRegisterModule(MODULE_NAME, "lua", OutputLuaLogInit);
 }
 
 #else
 
-void TmModuleLuaLogRegister (void) {
+void LuaLogRegister (void) {
     /* no-op */
 }
 

diff --git a/src/output-lua.h b/src/output-lua.h
index 627cdc37a25ef440f339214fa5808f4c36625531..c8c5ebbf45652ab8fab0faed8daa24ac42624ff1 100644 (file)
--- a/src/output-lua.h
+++ b/src/output-lua.h
@@ -24,6 +24,6 @@
 #ifndef __OUTPUT_LUA_H__
 #define __OUTPUT_LUA_H__
 
-void TmModuleLuaLogRegister (void);
+void LuaLogRegister(void);
 
 #endif /* __OUTPUT_LUA_H__ */

diff --git a/src/output-packet.c b/src/output-packet.c
index 85385e437b3a7ed50f28a962f0fc6d7c3b150b5c..3d18ad449cd6659a2c1e110afbd7e20b155aed64 100644 (file)
--- a/src/output-packet.c
+++ b/src/output-packet.c
@@ -209,7 +209,7 @@ static void OutputPacketLogExitPrintStats(ThreadVars *tv, void *thread_data)
     }
 }
 
-void TmModulePacketLoggerRegister (void)
+void OutputPacketLoggerRegister(void)
 {
     OutputRegisterRootLogger(OutputPacketLogThreadInit,
         OutputPacketLogThreadDeinit, OutputPacketLogExitPrintStats,

diff --git a/src/output-packet.h b/src/output-packet.h
index 408be05b273de23bd11e82da5f1b513a6caafdca..da40ccde47c1e6f5b956643efbfa9948f22e2bf4 100644 (file)
--- a/src/output-packet.h
+++ b/src/output-packet.h
@@ -41,7 +41,7 @@ int OutputRegisterPacketLogger(LoggerId logger_id, const char *name,
     PacketLogger LogFunc, PacketLogCondition ConditionFunc, OutputCtx *,
     ThreadInitFunc, ThreadDeinitFunc, ThreadExitPrintStatsFunc);
 
-void TmModulePacketLoggerRegister (void);
+void OutputPacketLoggerRegister(void);
 
 void OutputPacketShutdown(void);
 

diff --git a/src/output-streaming.c b/src/output-streaming.c
index 744ead6f274e04efaed7355a60e2befcc414db6b..1b800abd5481dcf6a3f3aa1584293f2bbc888963 100644 (file)
--- a/src/output-streaming.c
+++ b/src/output-streaming.c
@@ -441,7 +441,7 @@ static void OutputStreamingLogExitPrintStats(ThreadVars *tv, void *thread_data)
     }
 }
 
-void TmModuleStreamingLoggerRegister (void) {
+void OutputStreamingLoggerRegister(void) {
     OutputRegisterRootLogger(OutputStreamingLogThreadInit,
         OutputStreamingLogThreadDeinit, OutputStreamingLogExitPrintStats,
         OutputStreamingLog);

diff --git a/src/output-streaming.h b/src/output-streaming.h
index 8db555f94c4cb077a4f116dc066ecbc2a9a2aba0..bc02fe543be5f248da793d97d908208ff41fba14 100644 (file)
--- a/src/output-streaming.h
+++ b/src/output-streaming.h
@@ -50,7 +50,7 @@ int OutputRegisterStreamingLogger(LoggerId id, const char *name,
     ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit,
     ThreadExitPrintStatsFunc ThreadExitPrintStats);
 
-void TmModuleStreamingLoggerRegister (void);
+void OutputStreamingLoggerRegister (void);
 
 void OutputStreamingShutdown(void);
 

diff --git a/src/output-tx.c b/src/output-tx.c
index b39967c89917bf2b6c4a7508d5a89c659fae0533..004a83adc6107a30312dd836c8c4f44b25d6eb22 100644 (file)
--- a/src/output-tx.c
+++ b/src/output-tx.c
@@ -335,7 +335,7 @@ static void OutputTxLogExitPrintStats(ThreadVars *tv, void *thread_data)
     }
 }
 
-void TmModuleTxLoggerRegister (void)
+void OutputTxLoggerRegister (void)
 {
     OutputRegisterRootLogger(OutputTxLogThreadInit, OutputTxLogThreadDeinit,
         OutputTxLogExitPrintStats, OutputTxLog);

diff --git a/src/output-tx.h b/src/output-tx.h
index e548cdd16092cac365565f7fa9f2d055a837f06d..847d0b472b7ff738374b11274e6441382183f1fa 100644 (file)
--- a/src/output-tx.h
+++ b/src/output-tx.h
@@ -43,7 +43,7 @@ int OutputRegisterTxLogger(LoggerId id, const char *name, AppProto alproto,
         ThreadInitFunc, ThreadDeinitFunc,
         void (*ThreadExitPrintStats)(ThreadVars *, void *));
 
-void TmModuleTxLoggerRegister (void);
+void OutputTxLoggerRegister (void);
 
 void OutputTxShutdown(void);
 

diff --git a/src/output.c b/src/output.c
index 180f54fe95a11fb4a9b3eafc93b909b3fa3835fd..ed714e9023475256fef2338d1fbc7018fcea73ae 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007-2010 Open Information Security Foundation
+/* Copyright (C) 2007-2016 Open Information Security Foundation
  *
  * You can copy, redistribute or modify this Program under the terms of
  * the GNU General Public License version 2 as published by the Free
@@ -40,6 +40,36 @@
 #include "util-debug.h"
 #include "output.h"
 
+#include "alert-fastlog.h"
+#include "alert-unified2-alert.h"
+#include "alert-debuglog.h"
+#include "alert-prelude.h"
+#include "alert-syslog.h"
+#include "output-json-alert.h"
+#include "output-json-flow.h"
+#include "output-json-netflow.h"
+#include "log-droplog.h"
+#include "output-json-drop.h"
+#include "log-httplog.h"
+#include "output-json-http.h"
+#include "log-dnslog.h"
+#include "output-json-dns.h"
+#include "log-tlslog.h"
+#include "log-tlsstore.h"
+#include "output-json-tls.h"
+#include "output-json-ssh.h"
+#include "log-pcap.h"
+#include "log-file.h"
+#include "output-json-file.h"
+#include "output-json-smtp.h"
+#include "output-json-stats.h"
+#include "log-filestore.h"
+#include "log-tcp-data.h"
+#include "log-stats.h"
+#include "output-json.h"
+#include "output-json-template.h"
+#include "output-lua.h"
+
 typedef struct RootLogger_ {
     ThreadInitFunc ThreadInit;
     ThreadDeinitFunc ThreadDeinit;
@@ -59,6 +89,9 @@ typedef struct LoggerThreadStoreNode_ {
 
 typedef TAILQ_HEAD(LoggerThreadStore_, LoggerThreadStoreNode_) LoggerThreadStore;
 
+/**
+ * The list of all registered (known) output modules.
+ */
 OutputModuleList output_modules = TAILQ_HEAD_INITIALIZER(output_modules);
 
 /**
@@ -73,6 +106,9 @@ typedef struct OutputFileRolloverFlag_ {
 TAILQ_HEAD(, OutputFileRolloverFlag_) output_file_rotation_flags =
     TAILQ_HEAD_INITIALIZER(output_file_rotation_flags);
 
+void OutputRegisterRootLoggers(void);
+void OutputRegisterLoggers(void);
+
 /**
  * \brief Register an output module.
  *
@@ -984,9 +1020,81 @@ void TmModuleLoggerRegister(void)
     tmm_modules[TMM_LOGGER].ThreadDeinit = OutputLoggerThreadDeinit;
     tmm_modules[TMM_LOGGER].ThreadExitPrintStats = OutputLoggerExitPrintStats;
     tmm_modules[TMM_LOGGER].Func = OutputLoggerLog;;
+
+    OutputRegisterRootLoggers();
+    OutputRegisterLoggers();
 }
 
 void SetupOutputs(ThreadVars *tv)
 {
     TmSlotSetFuncAppend(tv, &tmm_modules[TMM_LOGGER], NULL);
 }
+
+/**
+ * \brief Register all root loggers.
+ */
+void OutputRegisterRootLoggers(void)
+{
+    OutputPacketLoggerRegister();
+    OutputTxLoggerRegister();
+    OutputFileLoggerRegister();
+    OutputFiledataLoggerRegister();
+    OutputStreamingLoggerRegister();
+}
+
+/**
+ * \brief Register all non-root logging modules.
+ */
+void OutputRegisterLoggers(void)
+{
+    LuaLogRegister();
+    /* fast log */
+    AlertFastLogRegister();
+    /* debug log */
+    AlertDebugLogRegister();
+    /* prelue log */
+    AlertPreludeRegister();
+    /* syslog log */
+    AlertSyslogRegister();
+    /* unified2 log */
+    Unified2AlertRegister();
+    /* drop log */
+    LogDropLogRegister();
+    JsonDropLogRegister();
+    /* json log */
+    OutputJsonRegister();
+    /* email logs */
+    JsonSmtpLogRegister();
+    /* http log */
+    LogHttpLogRegister();
+    JsonHttpLogRegister();
+    /* tls log */
+    LogTlsLogRegister();
+    JsonTlsLogRegister();
+    LogTlsStoreRegister();
+    /* ssh */
+    JsonSshLogRegister();
+    /* pcap log */
+    PcapLogRegister();
+    /* file log */
+    LogFileLogRegister();
+    JsonFileLogRegister();
+    LogFilestoreRegister();
+    /* dns log */
+    LogDnsLogRegister();
+    JsonDnsLogRegister();
+    /* tcp streaming data */
+    LogTcpDataLogRegister();
+    /* log stats */
+    LogStatsLogRegister();
+
+    JsonAlertLogRegister();
+    /* flow/netflow */
+    JsonFlowLogRegister();
+    JsonNetFlowLogRegister();
+    /* json stats */
+    JsonStatsLogRegister();
+
+    /* Template JSON logger. */
+    JsonTemplateLogRegister();
+}

diff --git a/src/suricata.c b/src/suricata.c
index dd45b1d363722603dbc85efe67727da75777a74d..2bbdb3bffbce99396225bbaa6f30622e5bde8a36 100644 (file)
--- a/src/suricata.c
+++ b/src/suricata.c
@@ -73,37 +73,6 @@
 #include "conf.h"
 #include "conf-yaml-loader.h"
 
-#include "alert-fastlog.h"
-#include "alert-unified2-alert.h"
-#include "alert-debuglog.h"
-#include "alert-prelude.h"
-#include "alert-syslog.h"
-#include "output-json-alert.h"
-
-#include "output-json-flow.h"
-#include "output-json-netflow.h"
-#include "log-droplog.h"
-#include "output-json-drop.h"
-#include "log-httplog.h"
-#include "output-json-http.h"
-#include "log-dnslog.h"
-#include "output-json-dns.h"
-#include "log-tlslog.h"
-#include "log-tlsstore.h"
-#include "output-json-tls.h"
-#include "output-json-ssh.h"
-#include "log-pcap.h"
-#include "log-file.h"
-#include "output-json-file.h"
-#include "output-json-smtp.h"
-#include "output-json-stats.h"
-#include "log-filestore.h"
-#include "log-tcp-data.h"
-#include "log-stats.h"
-
-#include "output-json.h"
-
-#include "output-json-template.h"
 
 #include "stream-tcp.h"
 
@@ -186,13 +155,6 @@
 #include "reputation.h"
 
 #include "output.h"
-#include "output-lua.h"
-
-#include "output-packet.h"
-#include "output-tx.h"
-#include "output-file.h"
-#include "output-filedata.h"
-#include "output-streaming.h"
 
 #include "util-privs.h"
 
@@ -867,65 +829,10 @@ void RegisterAllModules()
     /* respond-reject */
     TmModuleRespondRejectRegister();
 
-    TmModuleLuaLogRegister();
-    /* fast log */
-    TmModuleAlertFastLogRegister();
-    /* debug log */
-    TmModuleAlertDebugLogRegister();
-    /* prelue log */
-    TmModuleAlertPreludeRegister();
-    /* syslog log */
-    TmModuleAlertSyslogRegister();
-    /* unified2 log */
-    TmModuleUnified2AlertRegister();
-    /* drop log */
-    TmModuleLogDropLogRegister();
-    TmModuleJsonDropLogRegister();
-    /* json log */
-    TmModuleOutputJsonRegister();
-    /* email logs */
-    TmModuleJsonSmtpLogRegister();
-    /* http log */
-    TmModuleLogHttpLogRegister();
-    TmModuleJsonHttpLogRegister();
-    /* tls log */
-    TmModuleLogTlsLogRegister();
-    TmModuleJsonTlsLogRegister();
-    TmModuleLogTlsStoreRegister();
-    /* ssh */
-    TmModuleJsonSshLogRegister();
-    /* pcap log */
-    TmModulePcapLogRegister();
-    /* file log */
-    TmModuleLogFileLogRegister();
-    TmModuleJsonFileLogRegister();
-    TmModuleLogFilestoreRegister();
-    /* dns log */
-    TmModuleLogDnsLogRegister();
-    TmModuleJsonDnsLogRegister();
-    /* tcp streaming data */
-    TmModuleLogTcpDataLogRegister();
-    /* log stats */
-    TmModuleLogStatsLogRegister();
-
-    TmModuleJsonAlertLogRegister();
-    /* flow/netflow */
-    TmModuleJsonFlowLogRegister();
-    TmModuleJsonNetFlowLogRegister();
-    /* json stats */
-    TmModuleJsonStatsLogRegister();
-
-    /* Template JSON logger. */
-    TmModuleJsonTemplateLogRegister();
-
     /* log api */
     TmModuleLoggerRegister();
-    TmModulePacketLoggerRegister();
-    TmModuleTxLoggerRegister();
-    TmModuleFileLoggerRegister();
-    TmModuleFiledataLoggerRegister();
-    TmModuleStreamingLoggerRegister();
     TmModuleStatsLoggerRegister();
+
     TmModuleDebugList();
     /* nflog */
     TmModuleReceiveNFLOGRegister();
@@ -2412,8 +2319,6 @@ static int PostConfLoadedSetup(SCInstance *suri)
 
     TmModuleRunInit();
 
-    PcapLogProfileSetup();
-
     if (MayDaemonize(suri) != TM_ECODE_OK)
         SCReturnInt(TM_ECODE_FAILED);