]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
eve: drop: global metadata config
authorJason Ish <ish@unx.ca>
Mon, 11 Dec 2017 21:50:18 +0000 (15:50 -0600)
committerVictor Julien <victor@inliniac.net>
Tue, 30 Jan 2018 13:43:51 +0000 (14:43 +0100)
src/output-json-drop.c

index 2947a30684ff4c5995c79dd5b682fe3e3e087c0c..3a91f39bd460df7cc6435b10311dfc43a4f6e4e2 100644 (file)
@@ -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;