output/json: Refactor output buffer size macro

diff --git a/src/output-json-alert.c b/src/output-json-alert.c
index aad27822724f6cffeddd732116815ce6bcb50e78..6b6626e8db0a3e7f556a96b80f148cae03c06d71 100644 (file)
--- a/src/output-json-alert.c
+++ b/src/output-json-alert.c
@@ -705,7 +705,6 @@ static int JsonAlertLogCondition(ThreadVars *tv, const Packet *p)
     return FALSE;
 }
 
-#define OUTPUT_BUFFER_SIZE 65535
 static TmEcode JsonAlertLogThreadInit(ThreadVars *t, const void *initdata, void **data)
 {
     JsonAlertLogThread *aft = SCMalloc(sizeof(JsonAlertLogThread));
@@ -719,7 +718,7 @@ static TmEcode JsonAlertLogThreadInit(ThreadVars *t, const void *initdata, void
         return TM_ECODE_FAILED;
     }
 
-    aft->json_buffer = MemBufferCreateNew(OUTPUT_BUFFER_SIZE);
+    aft->json_buffer = MemBufferCreateNew(JSON_OUTPUT_BUFFER_SIZE);
     if (aft->json_buffer == NULL) {
         SCFree(aft);
         return TM_ECODE_FAILED;

diff --git a/src/output-json-anomaly.c b/src/output-json-anomaly.c
index e9b64af5b37ee38a4986203ea9a0828cce229533..8795539995ac93191bbddac51acf79af596bb87c 100644 (file)
--- a/src/output-json-anomaly.c
+++ b/src/output-json-anomaly.c
@@ -275,7 +275,6 @@ static int JsonAnomalyLogCondition(ThreadVars *tv, const Packet *p)
            AnomalyHasParserEvents(p);
 }
 
-#define OUTPUT_BUFFER_SIZE 65535
 static TmEcode JsonAnomalyLogThreadInit(ThreadVars *t, const void *initdata, void **data)
 {
     JsonAnomalyLogThread *aft = SCCalloc(1, sizeof(JsonAnomalyLogThread));
@@ -289,7 +288,7 @@ static TmEcode JsonAnomalyLogThreadInit(ThreadVars *t, const void *initdata, voi
         return TM_ECODE_FAILED;
     }
 
-    aft->json_buffer = MemBufferCreateNew(OUTPUT_BUFFER_SIZE);
+    aft->json_buffer = MemBufferCreateNew(JSON_OUTPUT_BUFFER_SIZE);
     if (aft->json_buffer == NULL) {
         SCFree(aft);
         return TM_ECODE_FAILED;

diff --git a/src/output-json-common.c b/src/output-json-common.c
index fba9c88b437eb625d109969b59db6623f2a5888b..d6c59b48dcadb0019002f51b28a928312503f5fc 100644 (file)
--- a/src/output-json-common.c
+++ b/src/output-json-common.c
@@ -73,7 +73,6 @@ OutputInitResult OutputJsonLogInitSub(ConfNode *conf, OutputCtx *parent_ctx)
     return result;
 }
 
-#define OUTPUT_BUFFER_SIZE 65535
 
 TmEcode JsonLogThreadInit(ThreadVars *t, const void *initdata, void **data)
 {
@@ -86,7 +85,7 @@ TmEcode JsonLogThreadInit(ThreadVars *t, const void *initdata, void **data)
         return TM_ECODE_FAILED;
     }
 
-    thread->buffer = MemBufferCreateNew(OUTPUT_BUFFER_SIZE);
+    thread->buffer = MemBufferCreateNew(JSON_OUTPUT_BUFFER_SIZE);
     if (unlikely(thread->buffer == NULL)) {
         SCFree(thread);
         return TM_ECODE_FAILED;

diff --git a/src/output-json-dhcp.c b/src/output-json-dhcp.c
index 5edebfad52f8162e608719e3ad042be039ce5772..c335d5f190d3ecf97e94cb5182b60ca97d7525ca 100644 (file)
--- a/src/output-json-dhcp.c
+++ b/src/output-json-dhcp.c
@@ -132,7 +132,6 @@ static OutputInitResult OutputDHCPLogInitSub(ConfNode *conf,
     return result;
 }
 
-#define OUTPUT_BUFFER_SIZE 65535
 
 static TmEcode JsonDHCPLogThreadInit(ThreadVars *t, const void *initdata, void **data)
 {
@@ -147,7 +146,7 @@ static TmEcode JsonDHCPLogThreadInit(ThreadVars *t, const void *initdata, void *
         return TM_ECODE_FAILED;
     }
 
-    thread->buffer = MemBufferCreateNew(OUTPUT_BUFFER_SIZE);
+    thread->buffer = MemBufferCreateNew(JSON_OUTPUT_BUFFER_SIZE);
     if (unlikely(thread->buffer == NULL)) {
         SCFree(thread);
         return TM_ECODE_FAILED;

diff --git a/src/output-json-dnp3.c b/src/output-json-dnp3.c
index 0e6d799ce3e82e01016e36c5fb31137340c4c17d..5830fc0e20c3619e768d82d09c89ec9efa1840fc 100644 (file)
--- a/src/output-json-dnp3.c
+++ b/src/output-json-dnp3.c
@@ -398,7 +398,6 @@ static OutputInitResult OutputDNP3LogInitSub(ConfNode *conf, OutputCtx *parent_c
     return result;
 }
 
-#define OUTPUT_BUFFER_SIZE 65535
 
 static TmEcode JsonDNP3LogThreadInit(ThreadVars *t, const void *initdata, void **data)
 {
@@ -413,7 +412,7 @@ static TmEcode JsonDNP3LogThreadInit(ThreadVars *t, const void *initdata, void *
         return TM_ECODE_FAILED;
     }
 
-    thread->buffer = MemBufferCreateNew(OUTPUT_BUFFER_SIZE);
+    thread->buffer = MemBufferCreateNew(JSON_OUTPUT_BUFFER_SIZE);
     if (unlikely(thread->buffer == NULL)) {
         SCFree(thread);
         return TM_ECODE_FAILED;

diff --git a/src/output-json-dns.c b/src/output-json-dns.c
index e0dd45bcf69aee2adbbba1ed844a618481038f7d..676866b7503e2027caefc4ada54da2e5fc413613 100644 (file)
--- a/src/output-json-dns.c
+++ b/src/output-json-dns.c
@@ -387,7 +387,6 @@ static int JsonDnsLoggerToClient(ThreadVars *tv, void *thread_data,
     SCReturnInt(TM_ECODE_OK);
 }
 
-#define OUTPUT_BUFFER_SIZE 65536
 static TmEcode LogDnsLogThreadInit(ThreadVars *t, const void *initdata, void **data)
 {
     LogDnsLogThread *aft = SCMalloc(sizeof(LogDnsLogThread));
@@ -402,7 +401,7 @@ static TmEcode LogDnsLogThreadInit(ThreadVars *t, const void *initdata, void **d
         return TM_ECODE_FAILED;
     }
 
-    aft->buffer = MemBufferCreateNew(OUTPUT_BUFFER_SIZE);
+    aft->buffer = MemBufferCreateNew(JSON_OUTPUT_BUFFER_SIZE);
     if (aft->buffer == NULL) {
         SCFree(aft);
         return TM_ECODE_FAILED;

diff --git a/src/output-json-drop.c b/src/output-json-drop.c
index 48b05688d62bf49c0e26fa5e2c3b9fe020367268..6086267a21c3896b4d5bb41e870e51dd4b69dfe3 100644 (file)
--- a/src/output-json-drop.c
+++ b/src/output-json-drop.c
@@ -182,7 +182,6 @@ static int DropLogJSON (JsonDropLogThread *aft, const Packet *p)
     return TM_ECODE_OK;
 }
 
-#define OUTPUT_BUFFER_SIZE 65535
 static TmEcode JsonDropLogThreadInit(ThreadVars *t, const void *initdata, void **data)
 {
     JsonDropLogThread *aft = SCMalloc(sizeof(JsonDropLogThread));
@@ -197,7 +196,7 @@ static TmEcode JsonDropLogThreadInit(ThreadVars *t, const void *initdata, void *
         return TM_ECODE_FAILED;
     }
 
-    aft->buffer = MemBufferCreateNew(OUTPUT_BUFFER_SIZE);
+    aft->buffer = MemBufferCreateNew(JSON_OUTPUT_BUFFER_SIZE);
     if (aft->buffer == NULL) {
         SCFree(aft);
         return TM_ECODE_FAILED;

diff --git a/src/output-json-file.c b/src/output-json-file.c
index 26dcc51ba79cc1d1634aeaa5816bf974ac32975c..17134a477a6d84bf514108470993748b022c9f25 100644 (file)
--- a/src/output-json-file.c
+++ b/src/output-json-file.c
@@ -283,7 +283,6 @@ static int JsonFileLogger(ThreadVars *tv, void *thread_data, const Packet *p,
 }
 
 
-#define OUTPUT_BUFFER_SIZE 65535
 static TmEcode JsonFileLogThreadInit(ThreadVars *t, const void *initdata, void **data)
 {
     JsonFileLogThread *aft = SCMalloc(sizeof(JsonFileLogThread));
@@ -301,7 +300,7 @@ static TmEcode JsonFileLogThreadInit(ThreadVars *t, const void *initdata, void *
     /* Use the Ouptut Context (file pointer and mutex) */
     aft->filelog_ctx = ((OutputCtx *)initdata)->data;
 
-    aft->buffer = MemBufferCreateNew(OUTPUT_BUFFER_SIZE);
+    aft->buffer = MemBufferCreateNew(JSON_OUTPUT_BUFFER_SIZE);
     if (aft->buffer == NULL) {
         SCFree(aft);
         return TM_ECODE_FAILED;

diff --git a/src/output-json-flow.c b/src/output-json-flow.c
index 7c0fab35c8fd125457d0e05fb011a90ef0811754..88a3a547f9f22dc8ed3782ac1e6073e50d33a2a4 100644 (file)
--- a/src/output-json-flow.c
+++ b/src/output-json-flow.c
@@ -484,7 +484,6 @@ static OutputInitResult OutputFlowLogInitSub(ConfNode *conf, OutputCtx *parent_c
     return result;
 }
 
-#define OUTPUT_BUFFER_SIZE 65535
 static TmEcode JsonFlowLogThreadInit(ThreadVars *t, const void *initdata, void **data)
 {
     JsonFlowLogThread *aft = SCMalloc(sizeof(JsonFlowLogThread));
@@ -502,7 +501,7 @@ static TmEcode JsonFlowLogThreadInit(ThreadVars *t, const void *initdata, void *
     /* Use the Ouptut Context (file pointer and mutex) */
     aft->flowlog_ctx = ((OutputCtx *)initdata)->data; //TODO
 
-    aft->buffer = MemBufferCreateNew(OUTPUT_BUFFER_SIZE);
+    aft->buffer = MemBufferCreateNew(JSON_OUTPUT_BUFFER_SIZE);
     if (aft->buffer == NULL) {
         SCFree(aft);
         return TM_ECODE_FAILED;

diff --git a/src/output-json-ftp.c b/src/output-json-ftp.c
index 0bf08daed4a1a406e1e5eaf4d67c12f3f989793e..9f54c0e5e9d19bfdae4ef94f39fa290a307f0670 100644 (file)
--- a/src/output-json-ftp.c
+++ b/src/output-json-ftp.c
@@ -249,7 +249,6 @@ static OutputInitResult OutputFTPLogInitSub(ConfNode *conf,
     return result;
 }
 
-#define OUTPUT_BUFFER_SIZE 65535
 static TmEcode JsonFTPLogThreadInit(ThreadVars *t, const void *initdata, void **data)
 {
     LogFTPLogThread *thread = SCCalloc(1, sizeof(*thread));
@@ -263,7 +262,7 @@ static TmEcode JsonFTPLogThreadInit(ThreadVars *t, const void *initdata, void **
         return TM_ECODE_FAILED;
     }
 
-    thread->buffer = MemBufferCreateNew(OUTPUT_BUFFER_SIZE);
+    thread->buffer = MemBufferCreateNew(JSON_OUTPUT_BUFFER_SIZE);
     if (unlikely(thread->buffer == NULL)) {
         SCFree(thread);
         return TM_ECODE_FAILED;

diff --git a/src/output-json-http.c b/src/output-json-http.c
index aebdd72521d99d052a9747e78dfb9ee96ab450a9..dc9d95c63e45e080cef0580009bce555bfbaf5d3 100644 (file)
--- a/src/output-json-http.c
+++ b/src/output-json-http.c
@@ -759,7 +759,6 @@ static OutputInitResult OutputHttpLogInitSub(ConfNode *conf, OutputCtx *parent_c
     return result;
 }
 
-#define OUTPUT_BUFFER_SIZE 65535
 static TmEcode JsonHttpLogThreadInit(ThreadVars *t, const void *initdata, void **data)
 {
     JsonHttpLogThread *aft = SCMalloc(sizeof(JsonHttpLogThread));
@@ -777,7 +776,7 @@ static TmEcode JsonHttpLogThreadInit(ThreadVars *t, const void *initdata, void *
     /* Use the Ouptut Context (file pointer and mutex) */
     aft->httplog_ctx = ((OutputCtx *)initdata)->data; //TODO
 
-    aft->buffer = MemBufferCreateNew(OUTPUT_BUFFER_SIZE);
+    aft->buffer = MemBufferCreateNew(JSON_OUTPUT_BUFFER_SIZE);
     if (aft->buffer == NULL) {
         SCFree(aft);
         return TM_ECODE_FAILED;

diff --git a/src/output-json-ikev2.c b/src/output-json-ikev2.c
index b0e5ec484c3d26f5b87c61b5d2d2600dfc9387eb..4c9d4166937ba2dcd4c53f14eb00fbdec549d829 100644 (file)
--- a/src/output-json-ikev2.c
+++ b/src/output-json-ikev2.c
@@ -131,8 +131,6 @@ static OutputInitResult OutputIKEv2LogInitSub(ConfNode *conf,
     return result;
 }
 
-#define OUTPUT_BUFFER_SIZE 65535
-
 static TmEcode JsonIKEv2LogThreadInit(ThreadVars *t, const void *initdata, void **data)
 {
     LogIKEv2LogThread *thread = SCCalloc(1, sizeof(*thread));
@@ -146,7 +144,7 @@ static TmEcode JsonIKEv2LogThreadInit(ThreadVars *t, const void *initdata, void
         return TM_ECODE_FAILED;
     }
 
-    thread->buffer = MemBufferCreateNew(OUTPUT_BUFFER_SIZE);
+    thread->buffer = MemBufferCreateNew(JSON_OUTPUT_BUFFER_SIZE);
     if (unlikely(thread->buffer == NULL)) {
         SCFree(thread);
         return TM_ECODE_FAILED;

diff --git a/src/output-json-krb5.c b/src/output-json-krb5.c
index 62c18114cbeeb9b2c411310dbb1138980c7681aa..2322c56f7fcf8d8c2a9c016ac4748f454ba21afa 100644 (file)
--- a/src/output-json-krb5.c
+++ b/src/output-json-krb5.c
@@ -132,8 +132,6 @@ static OutputInitResult OutputKRB5LogInitSub(ConfNode *conf,
     return result;
 }
 
-#define OUTPUT_BUFFER_SIZE 65535
-
 static TmEcode JsonKRB5LogThreadInit(ThreadVars *t, const void *initdata, void **data)
 {
     LogKRB5LogThread *thread = SCCalloc(1, sizeof(*thread));
@@ -147,7 +145,7 @@ static TmEcode JsonKRB5LogThreadInit(ThreadVars *t, const void *initdata, void *
         return TM_ECODE_FAILED;
     }
 
-    thread->buffer = MemBufferCreateNew(OUTPUT_BUFFER_SIZE);
+    thread->buffer = MemBufferCreateNew(JSON_OUTPUT_BUFFER_SIZE);
     if (unlikely(thread->buffer == NULL)) {
         SCFree(thread);
         return TM_ECODE_FAILED;

diff --git a/src/output-json-metadata.c b/src/output-json-metadata.c
index c90e1f98f4553c7de1c9b5030f1671bb85d9bfa9..25e71a3ea82d7ffd5466c9b7f68aefc1a1eb2a30 100644 (file)
--- a/src/output-json-metadata.c
+++ b/src/output-json-metadata.c
@@ -111,7 +111,6 @@ static int JsonMetadataLogCondition(ThreadVars *tv, const Packet *p)
     return FALSE;
 }
 
-#define OUTPUT_BUFFER_SIZE 65535
 static TmEcode JsonMetadataLogThreadInit(ThreadVars *t, const void *initdata, void **data)
 {
     JsonMetadataLogThread *aft = SCMalloc(sizeof(JsonMetadataLogThread));
@@ -125,7 +124,7 @@ static TmEcode JsonMetadataLogThreadInit(ThreadVars *t, const void *initdata, vo
         return TM_ECODE_FAILED;
     }
 
-    aft->json_buffer = MemBufferCreateNew(OUTPUT_BUFFER_SIZE);
+    aft->json_buffer = MemBufferCreateNew(JSON_OUTPUT_BUFFER_SIZE);
     if (aft->json_buffer == NULL) {
         SCFree(aft);
         return TM_ECODE_FAILED;

diff --git a/src/output-json-netflow.c b/src/output-json-netflow.c
index 570cc11e3c60366de25b97100d109a8900685e48..093135feb41b3058cf5d96d24d03a5b0f70a45fd 100644 (file)
--- a/src/output-json-netflow.c
+++ b/src/output-json-netflow.c
@@ -408,7 +408,6 @@ static OutputInitResult OutputNetFlowLogInitSub(ConfNode *conf, OutputCtx *paren
     return result;
 }
 
-#define OUTPUT_BUFFER_SIZE 65535
 static TmEcode JsonNetFlowLogThreadInit(ThreadVars *t, const void *initdata, void **data)
 {
     JsonNetFlowLogThread *aft = SCMalloc(sizeof(JsonNetFlowLogThread));
@@ -426,7 +425,7 @@ static TmEcode JsonNetFlowLogThreadInit(ThreadVars *t, const void *initdata, voi
     /* Use the Ouptut Context (file pointer and mutex) */
     aft->flowlog_ctx = ((OutputCtx *)initdata)->data; //TODO
 
-    aft->buffer = MemBufferCreateNew(OUTPUT_BUFFER_SIZE);
+    aft->buffer = MemBufferCreateNew(JSON_OUTPUT_BUFFER_SIZE);
     if (aft->buffer == NULL) {
         SCFree(aft);
         return TM_ECODE_FAILED;

diff --git a/src/output-json-smtp.c b/src/output-json-smtp.c
index b8079ab01211ce9da881cc0c96483b1f63af6d05..158e43a09ae34338cbb72a6144859423a1a8ff24 100644 (file)
--- a/src/output-json-smtp.c
+++ b/src/output-json-smtp.c
@@ -223,7 +223,6 @@ static OutputInitResult OutputSmtpLogInitSub(ConfNode *conf, OutputCtx *parent_c
     return result;
 }
 
-#define OUTPUT_BUFFER_SIZE 65535
 static TmEcode JsonSmtpLogThreadInit(ThreadVars *t, const void *initdata, void **data)
 {
     JsonEmailLogThread *aft = SCMalloc(sizeof(JsonEmailLogThread));
@@ -241,7 +240,7 @@ static TmEcode JsonSmtpLogThreadInit(ThreadVars *t, const void *initdata, void *
     /* Use the Ouptut Context (file pointer and mutex) */
     aft->emaillog_ctx = ((OutputCtx *)initdata)->data;
 
-    aft->buffer = MemBufferCreateNew(OUTPUT_BUFFER_SIZE);
+    aft->buffer = MemBufferCreateNew(JSON_OUTPUT_BUFFER_SIZE);
     if (aft->buffer == NULL) {
         SCFree(aft);
         return TM_ECODE_FAILED;

diff --git a/src/output-json-snmp.c b/src/output-json-snmp.c
index 3803512f3d1eeb79db1ef4b9655f50098a7b32ed..24b8013fd4f0d56ebff640eef14faaed6ab730b8 100644 (file)
--- a/src/output-json-snmp.c
+++ b/src/output-json-snmp.c
@@ -131,8 +131,6 @@ static OutputInitResult OutputSNMPLogInitSub(ConfNode *conf,
     return result;
 }
 
-#define OUTPUT_BUFFER_SIZE 65535
-
 static TmEcode JsonSNMPLogThreadInit(ThreadVars *t, const void *initdata, void **data)
 {
     LogSNMPLogThread *thread = SCCalloc(1, sizeof(*thread));
@@ -146,7 +144,7 @@ static TmEcode JsonSNMPLogThreadInit(ThreadVars *t, const void *initdata, void *
         return TM_ECODE_FAILED;
     }
 
-    thread->buffer = MemBufferCreateNew(OUTPUT_BUFFER_SIZE);
+    thread->buffer = MemBufferCreateNew(JSON_OUTPUT_BUFFER_SIZE);
     if (unlikely(thread->buffer == NULL)) {
         SCFree(thread);
         return TM_ECODE_FAILED;

diff --git a/src/output-json-ssh.c b/src/output-json-ssh.c
index c174eabfb33928e1694765f854b85b1e63b67d0f..3d64e196780a7d94876ad35cdcad25ebdb58ca77 100644 (file)
--- a/src/output-json-ssh.c
+++ b/src/output-json-ssh.c
@@ -131,7 +131,6 @@ static int JsonSshLogger(ThreadVars *tv, void *thread_data, const Packet *p,
     return 0;
 }
 
-#define OUTPUT_BUFFER_SIZE 65535
 static TmEcode JsonSshLogThreadInit(ThreadVars *t, const void *initdata, void **data)
 {
     JsonSshLogThread *aft = SCMalloc(sizeof(JsonSshLogThread));
@@ -149,7 +148,7 @@ static TmEcode JsonSshLogThreadInit(ThreadVars *t, const void *initdata, void **
     /* Use the Ouptut Context (file pointer and mutex) */
     aft->sshlog_ctx = ((OutputCtx *)initdata)->data;
 
-    aft->buffer = MemBufferCreateNew(OUTPUT_BUFFER_SIZE);
+    aft->buffer = MemBufferCreateNew(JSON_OUTPUT_BUFFER_SIZE);
     if (aft->buffer == NULL) {
         SCFree(aft);
         return TM_ECODE_FAILED;

diff --git a/src/output-json-stats.c b/src/output-json-stats.c
index e9b09b3e3a9a850bb575d52df4f827d67115365b..c6e7e3844edb66d980684bc69c2a6035c0d4bac4 100644 (file)
--- a/src/output-json-stats.c
+++ b/src/output-json-stats.c
@@ -326,7 +326,6 @@ static int JsonStatsLogger(ThreadVars *tv, void *thread_data, const StatsTable *
     SCReturnInt(0);
 }
 
-#define OUTPUT_BUFFER_SIZE 65535
 static TmEcode JsonStatsLogThreadInit(ThreadVars *t, const void *initdata, void **data)
 {
     JsonStatsLogThread *aft = SCMalloc(sizeof(JsonStatsLogThread));
@@ -344,7 +343,7 @@ static TmEcode JsonStatsLogThreadInit(ThreadVars *t, const void *initdata, void
     /* Use the Ouptut Context (file pointer and mutex) */
     aft->statslog_ctx = ((OutputCtx *)initdata)->data;
 
-    aft->buffer = MemBufferCreateNew(OUTPUT_BUFFER_SIZE);
+    aft->buffer = MemBufferCreateNew(JSON_OUTPUT_BUFFER_SIZE);
     if (aft->buffer == NULL) {
         SCFree(aft);
         return TM_ECODE_FAILED;

diff --git a/src/output-json-template-rust.c b/src/output-json-template-rust.c
index 1d719727374332cca32012dcd088422a25e632f4..35e3ce926e46639cdd7e10edeb0e75e487282fce 100644 (file)
--- a/src/output-json-template-rust.c
+++ b/src/output-json-template-rust.c
@@ -132,8 +132,6 @@ static OutputInitResult OutputTemplateLogInitSub(ConfNode *conf,
     return result;
 }
 
-#define OUTPUT_BUFFER_SIZE 65535
-
 static TmEcode JsonTemplateLogThreadInit(ThreadVars *t, const void *initdata, void **data)
 {
     LogTemplateLogThread *thread = SCCalloc(1, sizeof(*thread));
@@ -147,7 +145,7 @@ static TmEcode JsonTemplateLogThreadInit(ThreadVars *t, const void *initdata, vo
         return TM_ECODE_FAILED;
     }
 
-    thread->buffer = MemBufferCreateNew(OUTPUT_BUFFER_SIZE);
+    thread->buffer = MemBufferCreateNew(JSON_OUTPUT_BUFFER_SIZE);
     if (unlikely(thread->buffer == NULL)) {
         SCFree(thread);
         return TM_ECODE_FAILED;

diff --git a/src/output-json-template.c b/src/output-json-template.c
index 38bb6b756aa12db7951a4e6bd3cb5cd69e645801..2f09e6282649c29dd1654b6798b8ddff49253032 100644 (file)
--- a/src/output-json-template.c
+++ b/src/output-json-template.c
@@ -150,8 +150,6 @@ static OutputInitResult OutputTemplateLogInitSub(ConfNode *conf,
     return result;
 }
 
-#define OUTPUT_BUFFER_SIZE 65535
-
 static TmEcode JsonTemplateLogThreadInit(ThreadVars *t, const void *initdata, void **data)
 {
     LogTemplateLogThread *thread = SCCalloc(1, sizeof(*thread));
@@ -165,7 +163,7 @@ static TmEcode JsonTemplateLogThreadInit(ThreadVars *t, const void *initdata, vo
         return TM_ECODE_FAILED;
     }
 
-    thread->buffer = MemBufferCreateNew(OUTPUT_BUFFER_SIZE);
+    thread->buffer = MemBufferCreateNew(JSON_OUTPUT_BUFFER_SIZE);
     if (unlikely(thread->buffer == NULL)) {
         SCFree(thread);
         return TM_ECODE_FAILED;

diff --git a/src/output-json-tftp.c b/src/output-json-tftp.c
index ed6b73c35ebc42ae3c5c4d44b35dad6264837731..c7e6e5353d54fd93506d219351c9f6a0aed9f1b8 100644 (file)
--- a/src/output-json-tftp.c
+++ b/src/output-json-tftp.c
@@ -130,8 +130,6 @@ static OutputInitResult OutputTFTPLogInitSub(ConfNode *conf,
     return result;
 }
 
-#define OUTPUT_BUFFER_SIZE 65535
-
 static TmEcode JsonTFTPLogThreadInit(ThreadVars *t, const void *initdata, void **data)
 {
     LogTFTPLogThread *thread = SCCalloc(1, sizeof(*thread));
@@ -145,7 +143,7 @@ static TmEcode JsonTFTPLogThreadInit(ThreadVars *t, const void *initdata, void *
         return TM_ECODE_FAILED;
     }
 
-    thread->buffer = MemBufferCreateNew(OUTPUT_BUFFER_SIZE);
+    thread->buffer = MemBufferCreateNew(JSON_OUTPUT_BUFFER_SIZE);
     if (unlikely(thread->buffer == NULL)) {
         SCFree(thread);
         return TM_ECODE_FAILED;

diff --git a/src/output-json-tls.c b/src/output-json-tls.c
index f1c26ba9ea7788f4fd654079937e4f3509fdd7b0..e70aebb7f6810fdc8ff1a9293551bf65b2a37981 100644 (file)
--- a/src/output-json-tls.c
+++ b/src/output-json-tls.c
@@ -58,8 +58,6 @@ SC_ATOMIC_DECLARE(unsigned int, cert_id);
 #define MODULE_NAME "LogTlsLog"
 #define DEFAULT_LOG_FILENAME "tls.json"
 
-#define OUTPUT_BUFFER_SIZE 65535
-
 #define LOG_TLS_DEFAULT                 0
 #define LOG_TLS_EXTENDED                (1 << 0)
 #define LOG_TLS_CUSTOM                  (1 << 1)
@@ -478,7 +476,7 @@ static TmEcode JsonTlsLogThreadInit(ThreadVars *t, const void *initdata, void **
     /* use the Output Context (file pointer and mutex) */
     aft->tlslog_ctx = ((OutputCtx *)initdata)->data;
 
-    aft->buffer = MemBufferCreateNew(OUTPUT_BUFFER_SIZE);
+    aft->buffer = MemBufferCreateNew(JSON_OUTPUT_BUFFER_SIZE);
     if (aft->buffer == NULL) {
         SCFree(aft);
         return TM_ECODE_FAILED;

diff --git a/src/output-json.c b/src/output-json.c
index 0efe67044038f605bc0d5d01d5aff9e352f8f212..cf258707afd77900e1b8301961337441c683c49d 100644 (file)
--- a/src/output-json.c
+++ b/src/output-json.c
@@ -87,7 +87,6 @@ void OutputJsonRegister (void)
 #define DEFAULT_ALERT_SYSLOG_LEVEL              LOG_INFO
 #define MODULE_NAME "OutputJSON"
 
-#define OUTPUT_BUFFER_SIZE 65536
 #define MAX_JSON_SIZE 2048
 
 static void OutputJsonDeInitCtx(OutputCtx *);
@@ -839,7 +838,7 @@ int OutputJSONBuffer(json_t *js, LogFileCtx *file_ctx, MemBuffer **buffer)
 
     OutputJSONMemBufferWrapper wrapper = {
         .buffer = buffer,
-        .expand_by = OUTPUT_BUFFER_SIZE
+        .expand_by = JSON_OUTPUT_BUFFER_SIZE
     };
 
     int r = json_dump_callback(js, OutputJSONMemBufferCallback, &wrapper,

diff --git a/src/output-json.h b/src/output-json.h
index a7d996e4277aa854fd24321aa1957dab0024c8f6..99edefe1fbb175fe02859e81ee6b1a90552a565b 100644 (file)
--- a/src/output-json.h
+++ b/src/output-json.h
@@ -42,6 +42,9 @@ enum OutputJsonLogDirection {
     LOG_DIR_FLOW_TOSERVER,
 };
 
+/* Suggested output buffer size */
+#define JSON_OUTPUT_BUFFER_SIZE 65535
+
 /* helper struct for OutputJSONMemBufferCallback */
 typedef struct OutputJSONMemBufferWrapper_ {
     MemBuffer **buffer; /**< buffer to use & expand as needed */