From: Victor Julien <victor@inliniac.net>
Date: Mon, 19 Nov 2018 21:00:33 +0000 (+0100)
Subject: file: use u32 file id everywhere
X-Git-Tag: suricata-4.1.1~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16100e592dc081c31e538c21f30383871724e2b6;p=thirdparty%2Fsuricata.git

file: use u32 file id everywhere
---

diff --git a/src/detect-filestore.c b/src/detect-filestore.c
index 221e8595d4..5c474927c5 100644
--- a/src/detect-filestore.c
+++ b/src/detect-filestore.c
@@ -89,8 +89,8 @@ void DetectFilestoreRegister(void)
 /**
  *  \brief apply the post match filestore with options
  */
-static int FilestorePostMatchWithOptions(Packet *p, Flow *f, const DetectFilestoreData *filestore, FileContainer *fc,
-        uint16_t file_id, uint16_t tx_id)
+static int FilestorePostMatchWithOptions(Packet *p, Flow *f, const DetectFilestoreData *filestore,
+        FileContainer *fc, uint32_t file_id, uint64_t tx_id)
 {
     if (filestore == NULL) {
         SCReturnInt(0);
@@ -252,7 +252,7 @@ int DetectFilestorePostMatch(ThreadVars *t, DetectEngineThreadCtx *det_ctx, Pack
 static int DetectFilestoreMatch (ThreadVars *t, DetectEngineThreadCtx *det_ctx, Flow *f,
         uint8_t flags, File *file, const Signature *s, const SigMatchCtx *m)
 {
-    uint16_t file_id = 0;
+    uint32_t file_id = 0;
 
     SCEnter();
 
diff --git a/src/detect.h b/src/detect.h
index 7303da91bf..1ebeac49d7 100644
--- a/src/detect.h
+++ b/src/detect.h
@@ -1074,7 +1074,7 @@ typedef struct DetectEngineThreadCtx_ {
      * full signature matches, these are processed by a post-match filestore
      * function to finalize the store. */
     struct {
-        uint16_t file_id;
+        uint32_t file_id;
         uint64_t tx_id;
     } filestore[DETECT_FILESTORE_MAX];