From: Masud Hasan (mashasan) <mashasan@cisco.com>
Date: Tue, 20 Apr 2021 16:56:30 +0000 (+0000)
Subject: Merge pull request #2854 in SNORT/snort3 from ~SMINUT/snort3:hpq_reload_time to master
X-Git-Tag: 3.1.4.0~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2376f0d75c42335ae2a222f0a186c2121eb8180b;p=thirdparty%2Fsnort3.git

Merge pull request #2854 in SNORT/snort3 from ~SMINUT/snort3:hpq_reload_time to master

Squashed commit of the following:

commit 6fce6e70fea873975295861ac8963c4246319fe8
Author: Silviu Minut <sminut@cisco.com>
Date:   Tue Apr 20 10:20:14 2021 -0400

    stream: fix race condition in HPQReloadTuner
---

diff --git a/src/stream/base/stream_module.cc b/src/stream/base/stream_module.cc
index fcaefe2f0..205799532 100644
--- a/src/stream/base/stream_module.cc
+++ b/src/stream/base/stream_module.cc
@@ -37,6 +37,7 @@ using namespace snort;
 using namespace std;
 
 THREAD_LOCAL const Trace* stream_trace = nullptr;
+static THREAD_LOCAL timeval reload_time { };
 
 //-------------------------------------------------------------------------
 // stream module
diff --git a/src/stream/base/stream_module.h b/src/stream/base/stream_module.h
index 5da9849ba..4f4c1de4b 100644
--- a/src/stream/base/stream_module.h
+++ b/src/stream/base/stream_module.h
@@ -114,7 +114,6 @@ public:
 
 private:
     uint32_t held_packet_timeout;
-    timeval reload_time{};
 };
 
 class StreamUnloadReloadResourceManager : public snort::ReloadResourceTuner