From 944ab48b203fe37d47a9e8303da03251f6788e5e Mon Sep 17 00:00:00 2001
From: Victor Julien <victor@inliniac.net>
Date: Sun, 5 Feb 2017 22:01:59 +0100
Subject: [PATCH] file: clarify file store id name

---
 src/detect-filestore.c | 2 +-
 src/log-file.c         | 4 ++--
 src/log-filestore.c    | 4 ++--
 src/output-filedata.c  | 4 ++--
 src/output-json-file.c | 2 +-
 src/util-file.c        | 2 +-
 src/util-file.h        | 2 +-
 src/util-lua-common.c  | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/detect-filestore.c b/src/detect-filestore.c
index 666b6e36ef..7edf8b7d01 100644
--- a/src/detect-filestore.c
+++ b/src/detect-filestore.c
@@ -262,7 +262,7 @@ static int DetectFilestoreMatch (ThreadVars *t, DetectEngineThreadCtx *det_ctx,
     /* file can be NULL when a rule with filestore scope > file
      * matches. */
     if (file != NULL) {
-        file_id = file->file_id;
+        file_id = file->file_store_id;
     }
 
     det_ctx->filestore[det_ctx->filestore_cnt].file_id = file_id;
diff --git a/src/log-file.c b/src/log-file.c
index 0c04ff4125..2cc16e81d1 100644
--- a/src/log-file.c
+++ b/src/log-file.c
@@ -206,8 +206,8 @@ static void LogFileWriteJsonRecord(LogFileLogThread *aft, const Packet *p, const
 
     fprintf(fp, "{ ");
 
-    if (ff->file_id > 0)
-        fprintf(fp, "\"id\": %u, ", ff->file_id);
+    if (ff->file_store_id > 0)
+        fprintf(fp, "\"id\": %u, ", ff->file_store_id);
 
     fprintf(fp, "\"timestamp\": \"");
     PrintRawJsonFp(fp, (uint8_t *)timebuf, strlen(timebuf));
diff --git a/src/log-filestore.c b/src/log-filestore.c
index 0bc6c1f676..448b3ee3e4 100644
--- a/src/log-filestore.c
+++ b/src/log-filestore.c
@@ -243,7 +243,7 @@ static void LogFilestoreLogCloseMetaFile(const File *ff)
 {
     char filename[PATH_MAX] = "";
     snprintf(filename, sizeof(filename), "%s/file.%u",
-            g_logfile_base_dir, ff->file_id);
+            g_logfile_base_dir, ff->file_store_id);
     char metafilename[PATH_MAX] = "";
     snprintf(metafilename, sizeof(metafilename), "%s.meta", filename);
     FILE *fp = fopen(metafilename, "a");
@@ -325,7 +325,7 @@ static int LogFilestoreLogger(ThreadVars *tv, void *thread_data, const Packet *p
     SCLogDebug("ff %p, data %p, data_len %u", ff, data, data_len);
 
     snprintf(filename, sizeof(filename), "%s/file.%u",
-            g_logfile_base_dir, ff->file_id);
+            g_logfile_base_dir, ff->file_store_id);
 
     if (flags & OUTPUT_FILEDATA_FLAG_OPEN) {
         aft->file_cnt++;
diff --git a/src/output-filedata.c b/src/output-filedata.c
index 6a5345eaaa..6bfb529f82 100644
--- a/src/output-filedata.c
+++ b/src/output-filedata.c
@@ -193,9 +193,9 @@ static TmEcode OutputFiledataLog(ThreadVars *tv, Packet *p, void *thread_data)
             /* store */
 
             /* if file_id == 0, this is the first store of this file */
-            if (ff->file_id == 0) {
+            if (ff->file_store_id == 0) {
                 /* new file */
-                ff->file_id = SC_ATOMIC_ADD(file_id, 1);
+                ff->file_store_id = SC_ATOMIC_ADD(file_id, 1);
                 flags |= OUTPUT_FILEDATA_FLAG_OPEN;
             } else {
                 /* existing file */
diff --git a/src/output-json-file.c b/src/output-json-file.c
index 02b834b923..39bad3f85e 100644
--- a/src/output-json-file.c
+++ b/src/output-json-file.c
@@ -170,7 +170,7 @@ static void FileWriteJsonRecord(JsonFileLogThread *aft, const Packet *p, const F
     json_object_set_new(fjs, "stored",
                         (ff->flags & FILE_STORED) ? json_true() : json_false());
     if (ff->flags & FILE_STORED) {
-        json_object_set_new(fjs, "file_id", json_integer(ff->file_id));
+        json_object_set_new(fjs, "file_id", json_integer(ff->file_store_id));
     }
     json_object_set_new(fjs, "size", json_integer(FileTrackedSize(ff)));
     json_object_set_new(fjs, "tx_id", json_integer(ff->txid));
diff --git a/src/util-file.c b/src/util-file.c
index fbe149a3a9..447143cb89 100644
--- a/src/util-file.c
+++ b/src/util-file.c
@@ -1103,7 +1103,7 @@ void FileStoreFileById(FileContainer *fc, uint32_t file_id)
 
     if (fc != NULL) {
         for (ptr = fc->head; ptr != NULL; ptr = ptr->next) {
-            if (ptr->file_id == file_id) {
+            if (ptr->file_store_id == file_id) {
                 FileStore(ptr);
             }
         }
diff --git a/src/util-file.h b/src/util-file.h
index ddf212cfbc..82a7d56a7f 100644
--- a/src/util-file.h
+++ b/src/util-file.h
@@ -65,7 +65,7 @@ typedef struct File_ {
     int16_t state;
     StreamingBuffer *sb;
     uint64_t txid;                  /**< tx this file is part of */
-    uint32_t file_id;
+    uint32_t file_store_id;         /**< id used in store file name file.<id> */
     uint8_t *name;
 #ifdef HAVE_MAGIC
     char *magic;
diff --git a/src/util-lua-common.c b/src/util-lua-common.c
index b6a9c1c1d1..0624bb0e41 100644
--- a/src/util-lua-common.c
+++ b/src/util-lua-common.c
@@ -719,7 +719,7 @@ static int LuaCallbackFileInfoPushToStackFromFile(lua_State *luastate, const Fil
     char *sha256ptr = NULL;
 #endif
 
-    lua_pushnumber(luastate, file->file_id);
+    lua_pushnumber(luastate, file->file_store_id);
     lua_pushnumber(luastate, file->txid);
     lua_pushlstring(luastate, (char *)file->name, file->name_len);
     lua_pushnumber(luastate, FileTrackedSize(file));
-- 
2.47.2