file: minor debug updates

diff --git a/src/util-file.c b/src/util-file.c
index fec4771763b7a4b521afd7cc4bc8f331b20d3b54..3fbf74d67f7b1f682ab8c4ae2aef2f6c02194464 100644 (file)
--- a/src/util-file.c
+++ b/src/util-file.c
@@ -429,6 +429,8 @@ void FilePrintFlags(const File *file)
 
 void FilePrune(FileContainer *ffc)
 {
+    SCEnter();
+    SCLogDebug("ffc %p head %p", ffc, ffc->head);
     File *file = ffc->head;
     File *prev = NULL;
 
@@ -457,6 +459,7 @@ void FilePrune(FileContainer *ffc)
         FileFree(file);
         file = file_next;
     }
+    SCReturn;
 }
 
 /**
@@ -484,6 +487,7 @@ FileContainer *FileContainerAlloc(void)
  */
 void FileContainerRecycle(FileContainer *ffc)
 {
+    SCLogDebug("ffc %p", ffc);
     if (ffc == NULL)
         return;
 
@@ -503,6 +507,7 @@ void FileContainerRecycle(FileContainer *ffc)
  */
 void FileContainerFree(FileContainer *ffc)
 {
+    SCLogDebug("ffc %p", ffc);
     if (ffc == NULL)
         return;
 
@@ -554,6 +559,7 @@ static File *FileAlloc(const uint8_t *name, uint16_t name_len)
 
 static void FileFree(File *ff)
 {
+    SCLogDebug("ff %p", ff);
     if (ff == NULL)
         return;
 
@@ -581,6 +587,7 @@ static void FileFree(File *ff)
 
 void FileContainerAdd(FileContainer *ffc, File *ff)
 {
+    SCLogDebug("ffc %p ff %p", ffc, ff);
     if (ffc->head == NULL || ffc->tail == NULL) {
         ffc->head = ffc->tail = ff;
     } else {
@@ -596,6 +603,7 @@ void FileContainerAdd(FileContainer *ffc, File *ff)
  */
 int FileStore(File *ff)
 {
+    SCLogDebug("ff %p", ff);
     ff->flags |= FILE_STORE;
     SCReturnInt(0);
 }
@@ -650,7 +658,9 @@ static int FileStoreNoStoreCheck(File *ff)
 
 static int AppendData(File *file, const uint8_t *data, uint32_t data_len)
 {
+    SCLogDebug("file %p data_len %u", file, data_len);
     if (StreamingBufferAppendNoTrack(file->sb, data, data_len) != 0) {
+        SCLogDebug("file %p StreamingBufferAppendNoTrack failed", file);
         SCReturnInt(-1);
     }
 
@@ -661,7 +671,10 @@ static int AppendData(File *file, const uint8_t *data, uint32_t data_len)
         SCSha1Update(file->sha1_ctx, data, data_len);
     }
     if (file->sha256_ctx) {
+        SCLogDebug("SHA256 file %p data %p data_len %u", file, data, data_len);
         SCSha256Update(file->sha256_ctx, data, data_len);
+    } else {
+        SCLogDebug("NO SHA256 file %p data %p data_len %u", file, data, data_len);
     }
     SCReturnInt(0);
 }
@@ -721,6 +734,7 @@ static int FileAppendDataDo(File *ff, const uint8_t *data, uint32_t data_len)
             hash_done = 1;
         }
         if (ff->sha256_ctx) {
+            SCLogDebug("file %p data %p data_len %u", ff, data, data_len);
             SCSha256Update(ff->sha256_ctx, data, data_len);
             hash_done = 1;
         }
@@ -933,6 +947,7 @@ static File *FileOpenFile(FileContainer *ffc, const StreamingBufferConfig *sbcfg
     }
     if (!(ff->flags & FILE_NOSHA256) || g_file_force_sha256) {
         ff->sha256_ctx = SCSha256New();
+        SCLogDebug("ff %p ff->sha256_ctx %p", ff, ff->sha256_ctx);
     }
 
     ff->state = FILE_STATE_OPENED;
@@ -963,6 +978,7 @@ int FileOpenFileWithId(FileContainer *ffc, const StreamingBufferConfig *sbcfg,
         uint32_t track_id, const uint8_t *name, uint16_t name_len,
         const uint8_t *data, uint32_t data_len, uint16_t flags)
 {
+    SCLogDebug("ffc %p track_id %u", ffc, track_id);
     File *ff = FileOpenFile(ffc, sbcfg, name, name_len, data, data_len, flags);
     if (ff == NULL)
         return -1;
@@ -992,8 +1008,10 @@ int FileCloseFilePtr(File *ff, const uint8_t *data,
                 SCMd5Update(ff->md5_ctx, data, data_len);
             if (ff->sha1_ctx)
                 SCSha1Update(ff->sha1_ctx, data, data_len);
-            if (ff->sha256_ctx)
+            if (ff->sha256_ctx) {
+                SCLogDebug("file %p data %p data_len %u", ff, data, data_len);
                 SCSha256Update(ff->sha256_ctx, data, data_len);
+            }
         } else {
             if (AppendData(ff, data, data_len) != 0) {
                 ff->state = FILE_STATE_ERROR;
@@ -1003,6 +1021,9 @@ int FileCloseFilePtr(File *ff, const uint8_t *data,
     }
 
     if ((flags & FILE_TRUNCATED) || (ff->flags & FILE_HAS_GAPS)) {
+        SCLogDebug("flags FILE_TRUNCATED %s", (flags & FILE_TRUNCATED) ? "true" : "false");
+        SCLogDebug("ff->flags FILE_HAS_GAPS %s", (ff->flags & FILE_HAS_GAPS) ? "true" : "false");
+
         ff->state = FILE_STATE_TRUNCATED;
         SCLogDebug("flowfile state transitioned to FILE_STATE_TRUNCATED");
 
@@ -1011,6 +1032,7 @@ int FileCloseFilePtr(File *ff, const uint8_t *data,
             ff->flags |= FILE_NOSTORE;
         } else {
             if (g_file_force_sha256 && ff->sha256_ctx) {
+                SCLogDebug("file %p data %p data_len %u", ff, data, data_len);
                 FileEndSha256(ff);
             }
         }
@@ -1029,6 +1051,7 @@ int FileCloseFilePtr(File *ff, const uint8_t *data,
             ff->flags |= FILE_SHA1;
         }
         if (ff->sha256_ctx) {
+            SCLogDebug("file %p data %p data_len %u", ff, data, data_len);
             FileEndSha256(ff);
         }
     }
@@ -1279,6 +1302,7 @@ void FileTruncateAllOpenFiles(FileContainer *fc)
  */
 static void FileEndSha256(File *ff)
 {
+    SCLogDebug("ff %p ff->size %" PRIu64, ff, ff->size);
     if (!(ff->flags & FILE_SHA256) && ff->sha256_ctx) {
         SCSha256Finalize(ff->sha256_ctx, ff->sha256, sizeof(ff->sha256));
         ff->sha256_ctx = NULL;