loggers: all json tx loggers can share the same loggerid

This is to avoid the tx logging code that doesn't support LoggerId
values over 31 at this time. The simplest fix for now is to just have
all JSON (eve) loggers use the same ID.

DNP3 is left as-is for now as it needs some extra support in the parser.

diff --git a/src/output-json-dcerpc.c b/src/output-json-dcerpc.c
index 6ad9fe78d182c06f39634ad3f1cf8361914daee8..6ec19a0b849c8d993d17711d9ed570220bb3ebfc 100644 (file)
--- a/src/output-json-dcerpc.c
+++ b/src/output-json-dcerpc.c
@@ -67,10 +67,9 @@ static OutputInitResult DCERPCLogInitSub(ConfNode *conf, OutputCtx *parent_ctx)
 void JsonDCERPCLogRegister(void)
 {
     /* Register as an eve sub-module. */
-    OutputRegisterTxSubModule(LOGGER_JSON_DCERPC, "eve-log", "JsonDCERPCLog",
-        "eve-log.dcerpc", DCERPCLogInitSub, ALPROTO_DCERPC,
-        JsonDCERPCLogger, JsonLogThreadInit,
-        JsonLogThreadDeinit, NULL);
+    OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonDCERPCLog", "eve-log.dcerpc",
+            DCERPCLogInitSub, ALPROTO_DCERPC, JsonDCERPCLogger, JsonLogThreadInit,
+            JsonLogThreadDeinit, NULL);
 
     SCLogDebug("DCERPC JSON logger registered.");
 }

diff --git a/src/output-json-dhcp.c b/src/output-json-dhcp.c
index 3404e63227fa0bfcf3f37e52f1d801b1b7aa826a..d6a2111291aaa3d30a9368244757f90e64b6f898 100644 (file)
--- a/src/output-json-dhcp.c
+++ b/src/output-json-dhcp.c
@@ -146,8 +146,7 @@ static TmEcode JsonDHCPLogThreadDeinit(ThreadVars *t, void *data)
 void JsonDHCPLogRegister(void)
 {
     /* Register as an eve sub-module. */
-    OutputRegisterTxSubModule(LOGGER_JSON_DHCP, "eve-log", "JsonDHCPLog",
-        "eve-log.dhcp", OutputDHCPLogInitSub, ALPROTO_DHCP,
-        JsonDHCPLogger, JsonDHCPLogThreadInit,
-        JsonDHCPLogThreadDeinit, NULL);
+    OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonDHCPLog", "eve-log.dhcp",
+            OutputDHCPLogInitSub, ALPROTO_DHCP, JsonDHCPLogger, JsonDHCPLogThreadInit,
+            JsonDHCPLogThreadDeinit, NULL);
 }

diff --git a/src/output-json-dns.c b/src/output-json-dns.c
index 4fa7afe20164684cf9a541dcd198a328f898a7de..9a6f5d8b28fde4d16a8c29d9c60f4285db722c06 100644 (file)
--- a/src/output-json-dns.c
+++ b/src/output-json-dns.c
@@ -573,7 +573,7 @@ static OutputInitResult JsonDnsLogInitCtxSub(ConfNode *conf, OutputCtx *parent_c
 #define MODULE_NAME "JsonDnsLog"
 void JsonDnsLogRegister (void)
 {
-    OutputRegisterTxSubModule(LOGGER_JSON_DNS, "eve-log", MODULE_NAME, "eve-log.dns",
+    OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", MODULE_NAME, "eve-log.dns",
             JsonDnsLogInitCtxSub, ALPROTO_DNS, JsonDnsLogger, LogDnsLogThreadInit,
             LogDnsLogThreadDeinit, NULL);
 }

diff --git a/src/output-json-ftp.c b/src/output-json-ftp.c
index 6aab0d5fa988db33313f956b849096967bfafeb1..60e15e0e18477b5d5f9ecb906dd3e8d9d1db2c5e 100644 (file)
--- a/src/output-json-ftp.c
+++ b/src/output-json-ftp.c
@@ -204,10 +204,10 @@ static OutputInitResult OutputFTPLogInitSub(ConfNode *conf,
 void JsonFTPLogRegister(void)
 {
     /* Register as an eve sub-module. */
-    OutputRegisterTxSubModule(LOGGER_JSON_FTP, "eve-log", "JsonFTPLog", "eve-log.ftp",
+    OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonFTPLog", "eve-log.ftp",
             OutputFTPLogInitSub, ALPROTO_FTP, JsonFTPLogger, JsonLogThreadInit, JsonLogThreadDeinit,
             NULL);
-    OutputRegisterTxSubModule(LOGGER_JSON_FTP, "eve-log", "JsonFTPLog", "eve-log.ftp",
+    OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonFTPLog", "eve-log.ftp",
             OutputFTPLogInitSub, ALPROTO_FTPDATA, JsonFTPLogger, JsonLogThreadInit,
             JsonLogThreadDeinit, NULL);
 

diff --git a/src/output-json-http.c b/src/output-json-http.c
index a70943d1f19fd638a2c79f0ad489b377151a946b..4eb8ac7d32ad848ef16b9a5a48ad632d6a41c933 100644 (file)
--- a/src/output-json-http.c
+++ b/src/output-json-http.c
@@ -669,7 +669,7 @@ static TmEcode JsonHttpLogThreadDeinit(ThreadVars *t, void *data)
 void JsonHttpLogRegister (void)
 {
     /* register as child of eve-log */
-    OutputRegisterTxSubModule(LOGGER_JSON_HTTP, "eve-log", "JsonHttpLog", "eve-log.http",
+    OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonHttpLog", "eve-log.http",
             OutputHttpLogInitSub, ALPROTO_HTTP1, JsonHttpLogger, JsonHttpLogThreadInit,
             JsonHttpLogThreadDeinit, NULL);
 }

diff --git a/src/output-json-http2.c b/src/output-json-http2.c
index e5131e5108f7d40a8bfbdc0723ed034c4fbed01e..d762e76d0665882c5d0f878e158be5b3bb9555e0 100644 (file)
--- a/src/output-json-http2.c
+++ b/src/output-json-http2.c
@@ -178,9 +178,7 @@ static OutputInitResult OutputHttp2LogInitSub(ConfNode *conf, OutputCtx *parent_
 void JsonHttp2LogRegister (void)
 {
     /* also register as child of eve-log */
-    OutputRegisterTxSubModuleWithProgress(LOGGER_JSON_HTTP2,
-        "eve-log", MODULE_NAME, "eve-log.http2",
-        OutputHttp2LogInitSub, ALPROTO_HTTP2, JsonHttp2Logger,
-        HTTP2StateClosed, HTTP2StateClosed,
-        JsonHttp2LogThreadInit, JsonHttp2LogThreadDeinit, NULL);
+    OutputRegisterTxSubModuleWithProgress(LOGGER_JSON_TX, "eve-log", MODULE_NAME, "eve-log.http2",
+            OutputHttp2LogInitSub, ALPROTO_HTTP2, JsonHttp2Logger, HTTP2StateClosed,
+            HTTP2StateClosed, JsonHttp2LogThreadInit, JsonHttp2LogThreadDeinit, NULL);
 }

diff --git a/src/output-json-ike.c b/src/output-json-ike.c
index 85e47a44acf9709634e1409fe2f3d0e746fcaaac..e238a72e4f8ff4eb858febb29353191c3d493751 100644 (file)
--- a/src/output-json-ike.c
+++ b/src/output-json-ike.c
@@ -182,7 +182,7 @@ static TmEcode JsonIKELogThreadDeinit(ThreadVars *t, void *data)
 void JsonIKELogRegister(void)
 {
     /* Register as an eve sub-module. */
-    OutputRegisterTxSubModule(LOGGER_JSON_IKE, "eve-log", "JsonIKELog", "eve-log.ike",
+    OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonIKELog", "eve-log.ike",
             OutputIKELogInitSub, ALPROTO_IKE, JsonIKELogger, JsonIKELogThreadInit,
             JsonIKELogThreadDeinit, NULL);
 }

diff --git a/src/output-json-krb5.c b/src/output-json-krb5.c
index 24575012cae52e8697e68efdb9b0b5a5968788f0..8381cfd6132fcfeb30c51582b760d6be067fd8d5 100644 (file)
--- a/src/output-json-krb5.c
+++ b/src/output-json-krb5.c
@@ -86,7 +86,7 @@ static OutputInitResult OutputKRB5LogInitSub(ConfNode *conf,
 void JsonKRB5LogRegister(void)
 {
     /* Register as an eve sub-module. */
-    OutputRegisterTxSubModule(LOGGER_JSON_KRB5, "eve-log", "JsonKRB5Log", "eve-log.krb5",
+    OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonKRB5Log", "eve-log.krb5",
             OutputKRB5LogInitSub, ALPROTO_KRB5, JsonKRB5Logger, JsonLogThreadInit,
             JsonLogThreadDeinit, NULL);
 

diff --git a/src/output-json-modbus.c b/src/output-json-modbus.c
index ebe5df94f1a73c89129a9021a44f0e7c31fb4642..ace8c061f92dfaea1377d8d8ba5b89f8a70f5ea9 100644 (file)
--- a/src/output-json-modbus.c
+++ b/src/output-json-modbus.c
@@ -152,7 +152,7 @@ bool JsonModbusAddMetadata(const Flow *f, uint64_t tx_id, JsonBuilder *js)
 void JsonModbusLogRegister(void)
 {
     /* Register as an eve sub-module. */
-    OutputRegisterTxSubModule(LOGGER_JSON_MODBUS, "eve-log", "JsonModbusLog", "eve-log.modbus",
+    OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonModbusLog", "eve-log.modbus",
             OutputModbusLogInitSub, ALPROTO_MODBUS, JsonModbusLogger, JsonModbusLogThreadInit,
             JsonModbusLogThreadDeinit, NULL);
 

diff --git a/src/output-json-mqtt.c b/src/output-json-mqtt.c
index 17f1da95a021f2c9e149758f313b2f8331162bb1..7b3ca62131acd8d6b1a60a357fcc360a4d98621c 100644 (file)
--- a/src/output-json-mqtt.c
+++ b/src/output-json-mqtt.c
@@ -190,8 +190,7 @@ static TmEcode JsonMQTTLogThreadDeinit(ThreadVars *t, void *data)
 
 void JsonMQTTLogRegister(void)
 {
-    OutputRegisterTxSubModule(LOGGER_JSON_MQTT, "eve-log",
-        "JsonMQTTLog", "eve-log.mqtt",
-        OutputMQTTLogInitSub, ALPROTO_MQTT, JsonMQTTLogger,
-        JsonMQTTLogThreadInit, JsonMQTTLogThreadDeinit, NULL);
+    OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonMQTTLog", "eve-log.mqtt",
+            OutputMQTTLogInitSub, ALPROTO_MQTT, JsonMQTTLogger, JsonMQTTLogThreadInit,
+            JsonMQTTLogThreadDeinit, NULL);
 }

diff --git a/src/output-json-nfs.c b/src/output-json-nfs.c
index 22c51bc10d44f78a1ff78060a6f25c0d8d661b67..946f85cdbbd5d39b3ad5345d4e6a228b43cf6ef0 100644 (file)
--- a/src/output-json-nfs.c
+++ b/src/output-json-nfs.c
@@ -110,10 +110,8 @@ static OutputInitResult NFSLogInitSub(ConfNode *conf,
 void JsonNFSLogRegister(void)
 {
     /* Register as an eve sub-module. */
-    OutputRegisterTxSubModule(LOGGER_JSON_NFS, "eve-log", "JsonNFSLog",
-        "eve-log.nfs", NFSLogInitSub, ALPROTO_NFS,
-        JsonNFSLogger, JsonLogThreadInit,
-        JsonLogThreadDeinit, NULL);
+    OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonNFSLog", "eve-log.nfs", NFSLogInitSub,
+            ALPROTO_NFS, JsonNFSLogger, JsonLogThreadInit, JsonLogThreadDeinit, NULL);
 
     SCLogDebug("NFS JSON logger registered.");
 }

diff --git a/src/output-json-pgsql.c b/src/output-json-pgsql.c
index d2badcf7db0c40adff140a2479938a2e4bff8bd8..d586a48f291a980d76e47f0dacb2bfdade11be18 100644 (file)
--- a/src/output-json-pgsql.c
+++ b/src/output-json-pgsql.c
@@ -186,7 +186,7 @@ void JsonPgsqlLogRegister(void)
     }
     /* PGSQL_END_REMOVE */
     /* Register as an eve sub-module. */
-    OutputRegisterTxSubModule(LOGGER_JSON_PGSQL, "eve-log", "JsonPgsqlLog", "eve-log.pgsql",
+    OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonPgsqlLog", "eve-log.pgsql",
             OutputPgsqlLogInitSub, ALPROTO_PGSQL, JsonPgsqlLogger, JsonPgsqlLogThreadInit,
             JsonPgsqlLogThreadDeinit, NULL);
 

diff --git a/src/output-json-quic.c b/src/output-json-quic.c
index 698631eb5d728f49d8249cc335d83ae503a6e738..fdf2d0f09340d208a0d4c7ba84ff711dd22db2b1 100644 (file)
--- a/src/output-json-quic.c
+++ b/src/output-json-quic.c
@@ -156,7 +156,7 @@ bool JsonQuicAddMetadata(const Flow *f, uint64_t tx_id, JsonBuilder *js)
 void JsonQuicLogRegister(void)
 {
     /* Register as an eve sub-module. */
-    OutputRegisterTxSubModule(LOGGER_JSON_QUIC, "eve-log", "JsonQuicLog", "eve-log.quic",
+    OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonQuicLog", "eve-log.quic",
             OutputQuicLogInitSub, ALPROTO_QUIC, JsonQuicLogger, JsonQuicLogThreadInit,
             JsonQuicLogThreadDeinit, NULL);
 

diff --git a/src/output-json-rdp.c b/src/output-json-rdp.c
index 0c7cd32c94b99460689105bbae4805151a389a71..bc5d9ae9df8927970aae74d5d667d05bcc684daa 100644 (file)
--- a/src/output-json-rdp.c
+++ b/src/output-json-rdp.c
@@ -71,7 +71,7 @@ static OutputInitResult OutputRdpLogInitSub(ConfNode *conf,
 void JsonRdpLogRegister(void)
 {
     /* Register as an eve sub-module. */
-    OutputRegisterTxSubModule(LOGGER_JSON_RDP, "eve-log", "JsonRdpLog", "eve-log.rdp",
+    OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonRdpLog", "eve-log.rdp",
             OutputRdpLogInitSub, ALPROTO_RDP, JsonRdpLogger, JsonLogThreadInit, JsonLogThreadDeinit,
             NULL);
 

diff --git a/src/output-json-rfb.c b/src/output-json-rfb.c
index e3d87841e81477b387df195d4c21d180d13dc24a..285c22ab448249a82c62d9817f47c802c6102856 100644 (file)
--- a/src/output-json-rfb.c
+++ b/src/output-json-rfb.c
@@ -93,7 +93,7 @@ static OutputInitResult OutputRFBLogInitSub(ConfNode *conf,
 void JsonRFBLogRegister(void)
 {
     /* Register as an eve sub-module. */
-    OutputRegisterTxSubModule(LOGGER_JSON_RFB, "eve-log", "JsonRFBLog", "eve-log.rfb",
+    OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonRFBLog", "eve-log.rfb",
             OutputRFBLogInitSub, ALPROTO_RFB, JsonRFBLogger, JsonLogThreadInit, JsonLogThreadDeinit,
             NULL);
 }

diff --git a/src/output-json-sip.c b/src/output-json-sip.c
index 1b1a4baebbcc560ac8b154465b45133d52d1c065..8297be1cc3eb2e8cad51a2a32131d7a162155a3b 100644 (file)
--- a/src/output-json-sip.c
+++ b/src/output-json-sip.c
@@ -94,7 +94,7 @@ static OutputInitResult OutputSIPLogInitSub(ConfNode *conf,
 void JsonSIPLogRegister(void)
 {
     /* Register as an eve sub-module. */
-    OutputRegisterTxSubModule(LOGGER_JSON_SIP, "eve-log", "JsonSIPLog", "eve-log.sip",
+    OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonSIPLog", "eve-log.sip",
             OutputSIPLogInitSub, ALPROTO_SIP, JsonSIPLogger, JsonLogThreadInit, JsonLogThreadDeinit,
             NULL);
 

diff --git a/src/output-json-smb.c b/src/output-json-smb.c
index 1ab6f5c7ee40e6578268fe06ae4dbfd9fea3510b..492c50fe27a1c112c6b676a3c86e2eed71dc364e 100644 (file)
--- a/src/output-json-smb.c
+++ b/src/output-json-smb.c
@@ -79,10 +79,8 @@ static OutputInitResult SMBLogInitSub(ConfNode *conf, OutputCtx *parent_ctx)
 void JsonSMBLogRegister(void)
 {
     /* Register as an eve sub-module. */
-    OutputRegisterTxSubModule(LOGGER_JSON_SMB, "eve-log", "JsonSMBLog",
-        "eve-log.smb", SMBLogInitSub, ALPROTO_SMB,
-        JsonSMBLogger, JsonLogThreadInit,
-        JsonLogThreadDeinit, NULL);
+    OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonSMBLog", "eve-log.smb", SMBLogInitSub,
+            ALPROTO_SMB, JsonSMBLogger, JsonLogThreadInit, JsonLogThreadDeinit, NULL);
 
     SCLogDebug("SMB JSON logger registered.");
 }

diff --git a/src/output-json-smtp.c b/src/output-json-smtp.c
index b995fcc37059525553a80d0ce4d7e9f3a319bc4b..99771ec68fb4405b3de2d3a1a85ac59d2d9b7599 100644 (file)
--- a/src/output-json-smtp.c
+++ b/src/output-json-smtp.c
@@ -191,7 +191,7 @@ static TmEcode JsonSmtpLogThreadDeinit(ThreadVars *t, void *data)
 
 void JsonSmtpLogRegister (void) {
     /* register as child of eve-log */
-    OutputRegisterTxSubModule(LOGGER_JSON_SMTP, "eve-log", "JsonSmtpLog",
-        "eve-log.smtp", OutputSmtpLogInitSub, ALPROTO_SMTP, JsonSmtpLogger,
-        JsonSmtpLogThreadInit, JsonSmtpLogThreadDeinit, NULL);
+    OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonSmtpLog", "eve-log.smtp",
+            OutputSmtpLogInitSub, ALPROTO_SMTP, JsonSmtpLogger, JsonSmtpLogThreadInit,
+            JsonSmtpLogThreadDeinit, NULL);
 }

diff --git a/src/output-json-snmp.c b/src/output-json-snmp.c
index 28003687ccf860fbc92e7aeb825c0873264de01c..facf50770ac89111a4c69f12baf3a84a5db616bd 100644 (file)
--- a/src/output-json-snmp.c
+++ b/src/output-json-snmp.c
@@ -85,7 +85,7 @@ static OutputInitResult OutputSNMPLogInitSub(ConfNode *conf,
 void JsonSNMPLogRegister(void)
 {
     /* Register as an eve sub-module. */
-    OutputRegisterTxSubModule(LOGGER_JSON_SNMP, "eve-log", "JsonSNMPLog", "eve-log.snmp",
+    OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonSNMPLog", "eve-log.snmp",
             OutputSNMPLogInitSub, ALPROTO_SNMP, JsonSNMPLogger, JsonLogThreadInit,
             JsonLogThreadDeinit, NULL);
 

diff --git a/src/output-json-ssh.c b/src/output-json-ssh.c
index 708f2198335ca04876706e0225a50115c6a2b18b..5ec70142f634c70d1e8de9bf06c2c027cd09d67b 100644 (file)
--- a/src/output-json-ssh.c
+++ b/src/output-json-ssh.c
@@ -85,7 +85,7 @@ static OutputInitResult OutputSshLogInitSub(ConfNode *conf, OutputCtx *parent_ct
 void JsonSshLogRegister (void)
 {
     /* register as child of eve-log */
-    OutputRegisterTxSubModuleWithCondition(LOGGER_JSON_SSH, "eve-log", "JsonSshLog", "eve-log.ssh",
+    OutputRegisterTxSubModuleWithCondition(LOGGER_JSON_TX, "eve-log", "JsonSshLog", "eve-log.ssh",
             OutputSshLogInitSub, ALPROTO_SSH, JsonSshLogger, SSHTxLogCondition, JsonLogThreadInit,
             JsonLogThreadDeinit, NULL);
 }

diff --git a/src/output-json-template-rust.c b/src/output-json-template-rust.c
index 2c1c3e2f6dd9b032873e74b1a4d2a04d82798ccf..d71f0409799942c5dc8c135222e6a8f3775bd8df 100644 (file)
--- a/src/output-json-template-rust.c
+++ b/src/output-json-template-rust.c
@@ -172,10 +172,9 @@ void JsonTemplateRustLogRegister(void)
     }
     /* TEMPLATE_END_REMOVE */
     /* Register as an eve sub-module. */
-    OutputRegisterTxSubModule(LOGGER_JSON_TEMPLATE_RUST, "eve-log",
-        "JsonTemplateRustLog", "eve-log.template-rust",
-        OutputTemplateLogInitSub, ALPROTO_TEMPLATE_RUST, JsonTemplateLogger,
-        JsonTemplateLogThreadInit, JsonTemplateLogThreadDeinit, NULL);
+    OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonTemplateRustLog",
+            "eve-log.template-rust", OutputTemplateLogInitSub, ALPROTO_TEMPLATE_RUST,
+            JsonTemplateLogger, JsonTemplateLogThreadInit, JsonTemplateLogThreadDeinit, NULL);
 
     SCLogNotice("Template JSON logger registered.");
 }

diff --git a/src/output-json-template.c b/src/output-json-template.c
index c4d7f64cb911b079b99f9fd32bbb780c4d1bb8bb..0125205bf192a85e40c68487930eff4f745ab74e 100644 (file)
--- a/src/output-json-template.c
+++ b/src/output-json-template.c
@@ -180,10 +180,9 @@ void JsonTemplateLogRegister(void)
     }
     /* TEMPLATE_END_REMOVE */
     /* Register as an eve sub-module. */
-    OutputRegisterTxSubModule(LOGGER_JSON_TEMPLATE, "eve-log", "JsonTemplateLog",
-        "eve-log.template", OutputTemplateLogInitSub, ALPROTO_TEMPLATE,
-        JsonTemplateLogger, JsonTemplateLogThreadInit,
-        JsonTemplateLogThreadDeinit, NULL);
+    OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonTemplateLog", "eve-log.template",
+            OutputTemplateLogInitSub, ALPROTO_TEMPLATE, JsonTemplateLogger,
+            JsonTemplateLogThreadInit, JsonTemplateLogThreadDeinit, NULL);
 
     SCLogNotice("Template JSON logger registered.");
 }

diff --git a/src/output-json-tftp.c b/src/output-json-tftp.c
index 20f0010befb5104e1f52d600b91ff88cac9de9dc..4fff67a8b6960d5a54f76d45e07bfdc5bb0917fd 100644 (file)
--- a/src/output-json-tftp.c
+++ b/src/output-json-tftp.c
@@ -84,7 +84,7 @@ static OutputInitResult OutputTFTPLogInitSub(ConfNode *conf,
 void JsonTFTPLogRegister(void)
 {
     /* Register as an eve sub-module. */
-    OutputRegisterTxSubModule(LOGGER_JSON_TFTP, "eve-log", "JsonTFTPLog", "eve-log.tftp",
+    OutputRegisterTxSubModule(LOGGER_JSON_TX, "eve-log", "JsonTFTPLog", "eve-log.tftp",
             OutputTFTPLogInitSub, ALPROTO_TFTP, JsonTFTPLogger, JsonLogThreadInit,
             JsonLogThreadDeinit, NULL);
 

diff --git a/src/output-json-tls.c b/src/output-json-tls.c
index f825fe38c69dc497f02e01a8909dfa4ad09cde7c..d302d9106f56a227a978ad181f4ea80a489a7608 100644 (file)
--- a/src/output-json-tls.c
+++ b/src/output-json-tls.c
@@ -666,8 +666,7 @@ static OutputInitResult OutputTlsLogInitSub(ConfNode *conf, OutputCtx *parent_ct
 void JsonTlsLogRegister (void)
 {
     /* register as child of eve-log */
-    OutputRegisterTxSubModuleWithProgress(LOGGER_JSON_TLS, "eve-log",
-        "JsonTlsLog", "eve-log.tls", OutputTlsLogInitSub, ALPROTO_TLS,
-        JsonTlsLogger, TLS_HANDSHAKE_DONE, TLS_HANDSHAKE_DONE,
-        JsonTlsLogThreadInit, JsonTlsLogThreadDeinit, NULL);
+    OutputRegisterTxSubModuleWithProgress(LOGGER_JSON_TX, "eve-log", "JsonTlsLog", "eve-log.tls",
+            OutputTlsLogInitSub, ALPROTO_TLS, JsonTlsLogger, TLS_HANDSHAKE_DONE, TLS_HANDSHAKE_DONE,
+            JsonTlsLogThreadInit, JsonTlsLogThreadDeinit, NULL);
 }

diff --git a/src/suricata-common.h b/src/suricata-common.h
index ded159adc58d0832f6ca468a3d43306e90ab9b9a..0b79005b2773d26f3987894df02b68f568c1d5d3 100644 (file)
--- a/src/suricata-common.h
+++ b/src/suricata-common.h
@@ -445,38 +445,19 @@ typedef enum {
     LOGGER_HTTP,
     LOGGER_TLS_STORE,
     LOGGER_TLS,
-    LOGGER_JSON_DNS,
-    LOGGER_JSON_HTTP,
-    LOGGER_JSON_SMTP,
-    LOGGER_JSON_TLS,
-    LOGGER_JSON_NFS,
-    LOGGER_JSON_TFTP,
-    LOGGER_JSON_FTP,
+    LOGGER_JSON_TX,
+
+    /* DNP3 loggers. These ones don't fit the common model of a
+       transaction logger yet so are left with their own IDs for
+       now. */
     LOGGER_JSON_DNP3_TS,
     LOGGER_JSON_DNP3_TC,
-    LOGGER_JSON_SSH,
-    LOGGER_JSON_SMB,
-    LOGGER_JSON_IKE,
-    LOGGER_JSON_KRB5,
-    LOGGER_JSON_QUIC,
-    LOGGER_JSON_MODBUS,
-    LOGGER_JSON_DHCP,
-    LOGGER_JSON_SNMP,
-    LOGGER_JSON_SIP,
-    LOGGER_JSON_TEMPLATE_RUST,
-    LOGGER_JSON_RFB,
-    LOGGER_JSON_MQTT,
-    LOGGER_JSON_PGSQL,
-    LOGGER_JSON_TEMPLATE,
-    LOGGER_JSON_RDP,
-    LOGGER_JSON_DCERPC,
-    LOGGER_JSON_HTTP2,
 
     LOGGER_FILE,
     LOGGER_FILEDATA,
 
-    /** \warning when we exceed what we can express as a u32 flag here we need to update
-     *           LoggerFlags::flags (u32) and `tx_logged` in src/output-tx.c */
+    /** \warning Note that transaction loggers here with a value > 31
+        will not work. */
 
     /* non-tx loggers below */
 

diff --git a/src/util-profiling.c b/src/util-profiling.c
index 89bec12589b33a0252743ad9941b78d27a550a67..bcfdc3a59c2034c5d23c41580e9d50d589fd156a 100644 (file)
--- a/src/util-profiling.c
+++ b/src/util-profiling.c
@@ -1263,35 +1263,12 @@ const char * PacketProfileLoggertIdToString(LoggerId id)
         CASE_CODE (LOGGER_ALERT_SYSLOG);
         CASE_CODE (LOGGER_JSON_ALERT);
         CASE_CODE (LOGGER_JSON_ANOMALY);
-        CASE_CODE (LOGGER_JSON_DROP);
-        CASE_CODE (LOGGER_JSON_SSH);
-        CASE_CODE (LOGGER_JSON_SMB);
-        CASE_CODE (LOGGER_JSON_NFS);
+        CASE_CODE(LOGGER_JSON_DROP);
         CASE_CODE(LOGGER_JSON_FRAME);
         CASE_CODE (LOGGER_HTTP);
-        CASE_CODE(LOGGER_JSON_DNS);
+        CASE_CODE(LOGGER_JSON_TX);
         CASE_CODE (LOGGER_JSON_DNP3_TS);
-        CASE_CODE (LOGGER_JSON_DNP3_TC);
-        CASE_CODE (LOGGER_JSON_HTTP);
-        CASE_CODE(LOGGER_JSON_QUIC);
-        CASE_CODE (LOGGER_JSON_DHCP);
-        CASE_CODE (LOGGER_JSON_KRB5);
-        CASE_CODE(LOGGER_JSON_IKE);
-        CASE_CODE(LOGGER_JSON_MODBUS);
-        CASE_CODE (LOGGER_JSON_FTP);
-        CASE_CODE (LOGGER_JSON_TFTP);
-        CASE_CODE (LOGGER_JSON_SMTP);
-        CASE_CODE (LOGGER_JSON_SNMP);
-        CASE_CODE (LOGGER_JSON_TLS);
-        CASE_CODE (LOGGER_JSON_SIP);
-        CASE_CODE (LOGGER_JSON_TEMPLATE_RUST);
-        CASE_CODE (LOGGER_JSON_RFB);
-        CASE_CODE (LOGGER_JSON_MQTT);
-        CASE_CODE(LOGGER_JSON_PGSQL);
-        CASE_CODE (LOGGER_JSON_TEMPLATE);
-        CASE_CODE (LOGGER_JSON_RDP);
-        CASE_CODE (LOGGER_JSON_DCERPC);
-        CASE_CODE (LOGGER_JSON_HTTP2);
+        CASE_CODE(LOGGER_JSON_DNP3_TC);
         CASE_CODE (LOGGER_TLS_STORE);
         CASE_CODE (LOGGER_TLS);
         CASE_CODE (LOGGER_FILE_STORE);