From: Jason Ish <ish@unx.ca>
Date: Mon, 11 Dec 2017 21:50:18 +0000 (-0600)
Subject: eve: drop: global metadata config
X-Git-Tag: suricata-4.1.0-beta1~261
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5da5fc1f7deff03c3dd31ad654ede33c2f4c0bd2;p=thirdparty%2Fsuricata.git

eve: drop: global metadata config
---

diff --git a/src/output-json-drop.c b/src/output-json-drop.c
index 2947a30684..3a91f39bd4 100644
--- a/src/output-json-drop.c
+++ b/src/output-json-drop.c
@@ -65,6 +65,7 @@
 typedef struct JsonDropOutputCtx_ {
     LogFileCtx *file_ctx;
     uint8_t flags;
+    bool include_metadata;
 } JsonDropOutputCtx;
 
 typedef struct JsonDropLogThread_ {
@@ -86,11 +87,16 @@ static int g_droplog_flows_start = 1;
  */
 static int DropLogJSON (JsonDropLogThread *aft, const Packet *p)
 {
+    JsonDropOutputCtx *drop_ctx = aft->drop_ctx;
     uint16_t proto = 0;
     json_t *js = CreateJSONHeader((Packet *)p, 0, "drop");//TODO const
     if (unlikely(js == NULL))
         return TM_ECODE_OK;
 
+    if (drop_ctx->include_metadata) {
+        JsonAddMetadata(p, p->flow, js);
+    }
+
     json_t *djs = json_object();
     if (unlikely(djs == NULL)) {
         json_decref(js);
@@ -350,6 +356,7 @@ static OutputInitResult JsonDropLogInitCtxSub(ConfNode *conf, OutputCtx *parent_
     }
 
     drop_ctx->file_ctx = ajt->file_ctx;
+    drop_ctx->include_metadata = ajt->include_metadata;
 
     output_ctx->data = drop_ctx;
     output_ctx->DeInit = JsonDropLogDeInitCtxSub;