From: Lokesh Bevinamarad (lbevinam) <lbevinam@cisco.com>
Date: Tue, 15 Sep 2020 16:04:05 +0000 (+0000)
Subject: Merge pull request #2441 in SNORT/snort3 from ~BSACHDEV/snort3:timeout_bug to master
X-Git-Tag: 3.0.3-1~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e9c79965eababd2818bc5ba56c84c5e44b07c58;p=thirdparty%2Fsnort3.git

Merge pull request #2441 in SNORT/snort3 from ~BSACHDEV/snort3:timeout_bug to master

Squashed commit of the following:

commit a98f92fcb5f3806a5c34b96b760b33ebfc9a94cb
Author: bsachdev <bsachdev@cisco.com>
Date:   Mon Aug 31 01:28:06 2020 -0400

    file_api: updating lookup and block timeout from config at file cache creation

    Signed-off-by: bsachdev <bsachdev@cisco.com>
---

diff --git a/src/file_api/file_service.cc b/src/file_api/file_service.cc
index db43ff374..715be9a92 100644
--- a/src/file_api/file_service.cc
+++ b/src/file_api/file_service.cc
@@ -74,6 +74,8 @@ void FileService::post_init(const SnortConfig* sc)
     {
         file_cache = new FileCache(conf->max_files_cached);
         max_files_cached = conf->max_files_cached;
+        file_cache->set_block_timeout(conf->file_block_timeout);
+        file_cache->set_lookup_timeout(conf->file_lookup_timeout);
     }
 
     if (file_capture_enabled)