Merge pull request #1198 in SNORT/snort3 from new_linux to master

Squashed commit of the following:

commit 93a6a410cd28d7b699c6d361c0b9482d1e694734
Author: Russ Combs <rucombs@cisco.com>
Date:   Wed Apr 18 16:02:14 2018 -0400

    steam_tcp: change singleton names from linux to new_linux to avoid spurious collisions with defines

diff --git a/src/stream/tcp/tcp_normalizers.cc b/src/stream/tcp/tcp_normalizers.cc
index 303c5203744ff59a22810d8aa3ddb1aed1440a22..f54158d5a8afb43541ca4468984f7fedc7323f56 100644 (file)
--- a/src/stream/tcp/tcp_normalizers.cc
+++ b/src/stream/tcp/tcp_normalizers.cc
@@ -506,7 +506,7 @@ TcpNormalizer* TcpNormalizerFactory::create(StreamPolicy os_policy)
 {
     static TcpNormalizerFirst first;
     static TcpNormalizerLast last;
-    static TcpNormalizerLinux linux;
+    static TcpNormalizerLinux new_linux;
     static TcpNormalizerOldLinux old_linux;
     static TcpNormalizerBSD bsd;
     static TcpNormalizerMacOS mac_os;
@@ -525,7 +525,7 @@ TcpNormalizer* TcpNormalizerFactory::create(StreamPolicy os_policy)
     {
     case StreamPolicy::OS_FIRST: normalizer = &first; break;
     case StreamPolicy::OS_LAST: normalizer = &last; break;
-    case StreamPolicy::OS_LINUX: normalizer = &linux; break;
+    case StreamPolicy::OS_LINUX: normalizer = &new_linux; break;
     case StreamPolicy::OS_OLD_LINUX: normalizer = &old_linux; break;
     case StreamPolicy::OS_BSD: normalizer = &bsd; break;
     case StreamPolicy::OS_MACOS: normalizer = &mac_os; break;

diff --git a/src/stream/tcp/tcp_reassemblers.cc b/src/stream/tcp/tcp_reassemblers.cc
index 91b6b3ba9490eb3424b19f2e97654664e605d19e..df8f88c956396df4045e78313bf61c191ab04a94 100644 (file)
--- a/src/stream/tcp/tcp_reassemblers.cc
+++ b/src/stream/tcp/tcp_reassemblers.cc
@@ -302,7 +302,7 @@ TcpReassembler* TcpReassemblerFactory::create(StreamPolicy os_policy)
 {
     static TcpReassemblerFirst first;
     static TcpReassemblerLast last;
-    static TcpReassemblerLinux linux;
+    static TcpReassemblerLinux new_linux;
     static TcpReassemblerOldLinux old_linux;
     static TcpReassemblerBSD bsd;
     static TcpReassemblerMacOS mac_os;
@@ -323,7 +323,7 @@ TcpReassembler* TcpReassemblerFactory::create(StreamPolicy os_policy)
     {
     case StreamPolicy::OS_FIRST: reassembler = &first; break;
     case StreamPolicy::OS_LAST: reassembler = &last; break;
-    case StreamPolicy::OS_LINUX: reassembler = &linux; break;
+    case StreamPolicy::OS_LINUX: reassembler = &new_linux; break;
     case StreamPolicy::OS_OLD_LINUX: reassembler = &old_linux; break;
     case StreamPolicy::OS_BSD: reassembler = &bsd; break;
     case StreamPolicy::OS_MACOS: reassembler = &mac_os; break;