From: Jeff Lucovsky <jeff@lucovsky.org>
Date: Sat, 6 Jul 2019 13:42:10 +0000 (-0400)
Subject: output/json: Refactor output buffer size macro
X-Git-Tag: suricata-5.0.0-rc1~182
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d5eccf084cec618563bf1173fc62407e85c6111;p=thirdparty%2Fsuricata.git

output/json: Refactor output buffer size macro
---

diff --git a/src/output-json-alert.c b/src/output-json-alert.c
index aad2782272..6b6626e8db 100644
--- 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 e9b64af5b3..8795539995 100644
--- 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 fba9c88b43..d6c59b48dc 100644
--- 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 5edebfad52..c335d5f190 100644
--- 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 0e6d799ce3..5830fc0e20 100644
--- 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 e0dd45bcf6..676866b750 100644
--- 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 48b05688d6..6086267a21 100644
--- 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 26dcc51ba7..17134a477a 100644
--- 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 7c0fab35c8..88a3a547f9 100644
--- 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 0bf08daed4..9f54c0e5e9 100644
--- 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 aebdd72521..dc9d95c63e 100644
--- 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 b0e5ec484c..4c9d416693 100644
--- 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 62c18114cb..2322c56f7f 100644
--- 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 c90e1f98f4..25e71a3ea8 100644
--- 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 570cc11e3c..093135feb4 100644
--- 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 b8079ab012..158e43a09a 100644
--- 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 3803512f3d..24b8013fd4 100644
--- 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 c174eabfb3..3d64e19678 100644
--- 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 e9b09b3e3a..c6e7e3844e 100644
--- 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 1d71972737..35e3ce926e 100644
--- 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 38bb6b756a..2f09e62826 100644
--- 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 ed6b73c35e..c7e6e5353d 100644
--- 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 f1c26ba9ea..e70aebb7f6 100644
--- 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 0efe670440..cf258707af 100644
--- 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 a7d996e427..99edefe1fb 100644
--- 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 */