From: Jason Ish <ish@unx.ca>
Date: Thu, 18 Jan 2018 12:17:00 +0000 (-0600)
Subject: output-json-file: let caller decide if file is stored
X-Git-Tag: suricata-4.1.0-beta1~343
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ccbe7401b6ad171cc95c37486f826a2aa2d877b5;p=thirdparty%2Fsuricata.git

output-json-file: let caller decide if file is stored

Mainly for the filestore module, which may have its own
knowledge of the file being stored before others.
---

diff --git a/src/output-json-file.c b/src/output-json-file.c
index 33b1b40105..b295ea5baa 100644
--- a/src/output-json-file.c
+++ b/src/output-json-file.c
@@ -78,7 +78,8 @@ typedef struct JsonFileLogThread_ {
     MemBuffer *buffer;
 } JsonFileLogThread;
 
-json_t *JsonBuildFileInfoRecord(const Packet *p, const File *ff)
+json_t *JsonBuildFileInfoRecord(const Packet *p, const File *ff,
+        const bool stored)
 {
     json_t *js = CreateJSONHeader((Packet *)p, 0, "fileinfo"); //TODO const
     json_t *hjs = NULL;
@@ -176,8 +177,7 @@ json_t *JsonBuildFileInfoRecord(const Packet *p, const File *ff)
     }
 #endif
 
-    json_object_set_new(fjs, "stored",
-                        (ff->flags & FILE_STORED) ? json_true() : json_false());
+    json_object_set_new(fjs, "stored", stored ? json_true() : json_false());
     if (ff->flags & FILE_STORED) {
         json_object_set_new(fjs, "file_id", json_integer(ff->file_store_id));
     }
@@ -196,7 +196,8 @@ json_t *JsonBuildFileInfoRecord(const Packet *p, const File *ff)
  */
 static void FileWriteJsonRecord(JsonFileLogThread *aft, const Packet *p, const File *ff)
 {
-    json_t *js = JsonBuildFileInfoRecord(p, ff);
+    json_t *js = JsonBuildFileInfoRecord(p, ff,
+            ff->flags & FILE_STORED ? true : false);
     if (unlikely(js == NULL)) {
         return;
     }
diff --git a/src/output-json-file.h b/src/output-json-file.h
index 774693c539..fdd38d60ea 100644
--- a/src/output-json-file.h
+++ b/src/output-json-file.h
@@ -27,7 +27,8 @@
 void JsonFileLogRegister(void);
 
 #ifdef HAVE_LIBJANSSON
-json_t *JsonBuildFileInfoRecord(const Packet *p, const File *ff);
+json_t *JsonBuildFileInfoRecord(const Packet *p, const File *ff,
+        const bool stored);
 #endif
 
 #endif /* __OUTPUT_JSON_FILE_H__ */