From f302f3543fc816723a89c03f94c53bb1f375192b Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Thu, 5 Dec 2019 15:00:40 +0100 Subject: [PATCH] files: add call for setting inspect sizes The inspect sizes are currently only used during file prune house keeping for SMTP. --- src/app-layer-smtp.c | 8 ++++++-- src/util-file.c | 6 ++++++ src/util-file.h | 2 ++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/app-layer-smtp.c b/src/app-layer-smtp.c index d460409ddc..347467b510 100644 --- a/src/app-layer-smtp.c +++ b/src/app-layer-smtp.c @@ -394,8 +394,12 @@ static void SMTPNewFile(SMTPTransaction *tx, File *file) #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; + + /* set inspect sizes used in file pruning logic. + * TODO consider moving this to the file.data code that + * would actually have use for this. */ + FileSetInspectSizes(file, smtp_config.content_inspect_window, + smtp_config.content_inspect_min_size); } int SMTPProcessDataChunk(const uint8_t *chunk, uint32_t len, diff --git a/src/util-file.c b/src/util-file.c index 33db0926b0..f148dff88a 100644 --- a/src/util-file.c +++ b/src/util-file.c @@ -770,6 +770,12 @@ int FileAppendGAPById(FileContainer *ffc, uint32_t track_id, SCReturnInt(-1); } +void FileSetInspectSizes(File *file, const uint32_t win, const uint32_t min) +{ + file->inspect_window = win; + file->inspect_min_size = min; +} + /** * \brief Sets the offset range for a file. * diff --git a/src/util-file.h b/src/util-file.h index 2a77a0fba0..d907fc14f1 100644 --- a/src/util-file.h +++ b/src/util-file.h @@ -168,6 +168,8 @@ int FileAppendDataById(FileContainer *, uint32_t track_id, int FileAppendGAPById(FileContainer *ffc, uint32_t track_id, const uint8_t *data, uint32_t data_len); +void FileSetInspectSizes(File *file, const uint32_t win, const uint32_t min); + /** * \brief Sets the offset range for a file. *