smtp: fix and clean up new file handling

Set tx id on files that were just opened.

Move logic to a small util func.

diff --git a/src/app-layer-smtp.c b/src/app-layer-smtp.c
index 442239b4034caaccf0b44d3847929cd714bc9151..d460409ddc558105e59e557bc59d13553051b97d 100644 (file)
--- a/src/app-layer-smtp.c
+++ b/src/app-layer-smtp.c
@@ -55,6 +55,7 @@
 
 #include "util-mem.h"
 #include "util-misc.h"
+#include "util-validate.h"
 
 /* content-limit default value */
 #define FILEDATA_CONTENT_LIMIT 100000
@@ -380,6 +381,23 @@ static void FlagDetectStateNewFile(SMTPTransaction *tx)
     }
 }
 
+static void SMTPNewFile(SMTPTransaction *tx, File *file)
+{
+    DEBUG_VALIDATE_BUG_ON(tx == NULL);
+    DEBUG_VALIDATE_BUG_ON(file == NULL);
+#ifdef UNITTESTS
+    if (RunmodeIsUnittests()) {
+        if (tx == NULL || file == NULL) {
+            return;
+        }
+    }
+#endif
+    FlagDetectStateNewFile(tx);
+    FileSetTx(file, tx->tx_id);
+    file->inspect_window = smtp_config.content_inspect_window;
+    file->inspect_min_size = smtp_config.content_inspect_min_size;
+}
+
 int SMTPProcessDataChunk(const uint8_t *chunk, uint32_t len,
         MimeDecParseState *state)
 {
@@ -437,9 +455,7 @@ int SMTPProcessDataChunk(const uint8_t *chunk, uint32_t len,
                 ret = MIME_DEC_ERR_DATA;
                 SCLogDebug("FileOpenFile() failed");
             }
-            FlagDetectStateNewFile(smtp_state->curr_tx);
-            files->tail->inspect_window = smtp_config.content_inspect_window;
-            files->tail->inspect_min_size = smtp_config.content_inspect_min_size;
+            SMTPNewFile(smtp_state->curr_tx, files->tail);
 
             /* If close in the same chunk, then pass in empty bytes */
             if (state->body_end) {
@@ -1226,7 +1242,7 @@ static int SMTPProcessRequest(SMTPState *state, Flow *f,
                         state->file_track_id++,
                         (uint8_t*) msgname, strlen(msgname), NULL, 0,
                         FILE_NOMD5|FILE_NOMAGIC|FILE_USE_DETECT) == 0) {
-                    FlagDetectStateNewFile(state->curr_tx);
+                    SMTPNewFile(state->curr_tx, state->files_ts->tail);
                 }
             } else if (smtp_config.decode_mime) {
                 if (tx->mime_state) {