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 fcaefe2f098040b440e5af39c488ae1316158449..2057995322b400bbaa05a6aa63a3cf27fbd8a656 100644 (file)
--- 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 5da9849ba24ecc7b6bb2fb4a05ecb15087867cee..4f4c1de4b5e4dff925d9dc8971b9b1e9daff2c04 100644 (file)
--- 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