From: Oleg Torubara -X (otorubar - SOFTSERVE INC at Cisco) <otorubar@cisco.com>
Date: Wed, 15 Jan 2025 22:26:50 +0000 (+0000)
Subject: Pull request #4568: file_api: add pending expire time reset for FileInfo
X-Git-Tag: 3.6.2.0~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0b6ee2025eab0ee2314cad6f34b36bb2aa5e7aa0;p=thirdparty%2Fsnort3.git

Pull request #4568: file_api: add pending expire time reset for FileInfo

Merge in SNORT/snort3 from ~OTORUBAR/snort3:handle_timeouts to master

Squashed commit of the following:

commit 4309f844ebfae650ff15bb310948d25dcb9ce449
Author: otorubar <otorubar@cisco.com>
Date:   Mon Jan 13 09:14:43 2025 -0800

    file_api: add pending expire time reset for FileInfo
---

diff --git a/src/file_api/file_lib.cc b/src/file_api/file_lib.cc
index 592e8791d..09aa3a24d 100644
--- a/src/file_api/file_lib.cc
+++ b/src/file_api/file_lib.cc
@@ -518,6 +518,8 @@ void FileInfo::reset()
     reset_sha();
     if (is_file_name_set())
         unset_file_name();
+    pending_expire_time.tv_sec = 0;
+    pending_expire_time.tv_usec = 0;
 }
 
 void FileInfo::set_re_eval()