From: Jeff Lucovsky <jeff@lucovsky.org>
Date: Mon, 29 Jun 2020 13:48:20 +0000 (-0400)
Subject: output/tftp: Include common options
X-Git-Tag: suricata-6.0.0-beta1~300
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=414bb25c931556b313c028e0d446953d95f7c136;p=thirdparty%2Fsuricata.git

output/tftp: Include common options

This commit will cause common metadata values and the community id to be
included in log output when configured.
---

diff --git a/src/output-json-tftp.c b/src/output-json-tftp.c
index 182962b866..dbad0ae4e7 100644
--- a/src/output-json-tftp.c
+++ b/src/output-json-tftp.c
@@ -53,6 +53,7 @@
 typedef struct LogTFTPFileCtx_ {
     LogFileCtx *file_ctx;
     uint32_t    flags;
+    OutputJsonCommonSettings cfg;
 } LogTFTPFileCtx;
 
 typedef struct LogTFTPLogThread_ {
@@ -78,6 +79,7 @@ static int JsonTFTPLogger(ThreadVars *tv, void *thread_data,
 
     json_object_set_new(js, "tftp", tftpjs);
 
+    JsonAddCommonOptions(&thread->tftplog_ctx->cfg, p, f, js);
     MemBufferReset(thread->buffer);
     OutputJSONBuffer(js, thread->tftplog_ctx->file_ctx, &thread->buffer);
 
@@ -107,6 +109,7 @@ static OutputInitResult OutputTFTPLogInitSub(ConfNode *conf,
         return result;
     }
     tftplog_ctx->file_ctx = ajt->file_ctx;
+    tftplog_ctx->cfg = ajt->cfg;
 
     OutputCtx *output_ctx = SCCalloc(1, sizeof(*output_ctx));
     if (unlikely(output_ctx == NULL)) {