From: Ed Borgoyn <eborgoyn@cisco.com>
Date: Thu, 28 Apr 2016 17:24:40 +0000 (-0400)
Subject: Missed two THREAD_LOCAL attributes on object pointers.
X-Git-Tag: 3.0.0-233~414^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8dc406a905d94ce9093e98f300eae2e35862cb42;p=thirdparty%2Fsnort3.git

Missed two THREAD_LOCAL attributes on object pointers.
---

diff --git a/src/stream/base/stream_ha.cc b/src/stream/base/stream_ha.cc
index 37143dcc4..b43cf1b56 100644
--- a/src/stream/base/stream_ha.cc
+++ b/src/stream/base/stream_ha.cc
@@ -19,6 +19,8 @@
 
 #include "stream_ha.h"
 
+#include <thread>
+
 #include "main/snort_debug.h"
 
 typedef LwState SessionHAContent;
@@ -54,7 +56,7 @@ void ProtocolHA::process_deletion(Flow* flow)
     HighAvailabilityManager::process_deletion(flow);
 }
 
-StreamHAClient* StreamHAManager::ha_client;
+THREAD_LOCAL StreamHAClient* StreamHAManager::ha_client;
 
 void StreamHAManager::tinit()
 {
diff --git a/src/stream/base/stream_ha.h b/src/stream/base/stream_ha.h
index 0a7d5ce68..6bc7ae35f 100644
--- a/src/stream/base/stream_ha.h
+++ b/src/stream/base/stream_ha.h
@@ -58,7 +58,7 @@ public:
     static void tterm();
     static void process_deletion(Flow*);
 
-    static StreamHAClient* ha_client;
+    static THREAD_LOCAL StreamHAClient* ha_client;
 };
 #endif
 
diff --git a/src/stream/udp/udp_ha.cc b/src/stream/udp/udp_ha.cc
index 2161a983d..66227886e 100644
--- a/src/stream/udp/udp_ha.cc
+++ b/src/stream/udp/udp_ha.cc
@@ -31,7 +31,7 @@ void UdpHA::create_session(Flow*)
     DebugMessage(DEBUG_HA,"UdpHA::create_session)\n");
 }
 
-UdpHA* UdpHAManager::udp_ha;
+THREAD_LOCAL UdpHA* UdpHAManager::udp_ha;
 
 void UdpHAManager::tinit()
 {
diff --git a/src/stream/udp/udp_ha.h b/src/stream/udp/udp_ha.h
index 4e31b62d5..4f69d29c8 100644
--- a/src/stream/udp/udp_ha.h
+++ b/src/stream/udp/udp_ha.h
@@ -44,7 +44,7 @@ public:
     { udp_ha->process_deletion(flow); }
     static void tinit();
     static void tterm();
-    static UdpHA* udp_ha;
+    static THREAD_LOCAL UdpHA* udp_ha;
 };
 #endif