From: Juweria Ali Imran (jaliimra) Date: Mon, 24 Mar 2025 17:15:42 +0000 (+0000) Subject: Pull request #4670: stream_tcp: rename OS policy names to prevent conflict with exist... X-Git-Tag: 3.7.2.0~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fac8bea517c593ae05b9dbe42c4eeb0dfe05405a;p=thirdparty%2Fsnort3.git Pull request #4670: stream_tcp: rename OS policy names to prevent conflict with existing macros Merge in SNORT/snort3 from ~JALIIMRA/snort3:bsd_identifier to master Squashed commit of the following: commit b12a29259c3e9a0fea148e841d4cdb91686fcb27 Author: Juweria Ali Imran Date: Fri Mar 21 11:48:21 2025 -0400 stream_tcp: rename OS policy names to prevent conflict with existing macros --- diff --git a/src/stream/tcp/tcp_defs.h b/src/stream/tcp/tcp_defs.h index 5232629e7..43f8ec76e 100644 --- a/src/stream/tcp/tcp_defs.h +++ b/src/stream/tcp/tcp_defs.h @@ -66,21 +66,21 @@ namespace Normalizer { FIRST = 0, LAST, - LINUX, - OLD_LINUX, - BSD, - MACOS, - SOLARIS, - IRIX, - HPUX11, - HPUX10, - WINDOWS, - WINDOWS2K3, - VISTA, + OS_LINUX, + OS_OLD_LINUX, + OS_BSD, + OS_MACOS, + OS_SOLARIS, + OS_IRIX, + OS_HPUX11, + OS_HPUX10, + OS_WINDOWS, + OS_WINDOWS2K3, + OS_VISTA, PROXY, MISSED_3WHS, MAX_NORM_POLICY, - DEFAULT = BSD + DEFAULT = OS_BSD }; } @@ -104,19 +104,19 @@ namespace Overlap { FIRST = 0, LAST, - LINUX, - OLD_LINUX, - BSD, - MACOS, - SOLARIS, - IRIX, - HPUX11, - HPUX10, - WINDOWS, - WINDOWS2K3, - VISTA, + OS_LINUX, + OS_OLD_LINUX, + OS_BSD, + OS_MACOS, + OS_SOLARIS, + OS_IRIX, + OS_HPUX11, + OS_HPUX10, + OS_WINDOWS, + OS_WINDOWS2K3, + OS_VISTA, MAX_OVERLAP_POLICY, - DEFAULT_POLICY = BSD + DEFAULT_POLICY = OS_BSD }; } diff --git a/src/stream/tcp/tcp_normalizer.cc b/src/stream/tcp/tcp_normalizer.cc index f13f19eac..853e27512 100644 --- a/src/stream/tcp/tcp_normalizer.cc +++ b/src/stream/tcp/tcp_normalizer.cc @@ -437,7 +437,7 @@ int TcpNormalizer::validate_paws( tns.session->tel.set_tcp_event(EVENT_NO_TIMESTAMP); /* Ignore the timestamp for this first packet, next one will checked. */ - if ( tns.session->tcp_config->policy == Normalizer::Policy::SOLARIS ) + if ( tns.session->tcp_config->policy == Normalizer::Policy::OS_SOLARIS ) tns.tracker->clear_tf_flags(TF_TSTAMP); packet_dropper(tns, tsd, NORM_TCP_OPT); diff --git a/src/stream/tcp/tcp_normalizers.cc b/src/stream/tcp/tcp_normalizers.cc index 5c5df8f26..1c052c9b4 100644 --- a/src/stream/tcp/tcp_normalizers.cc +++ b/src/stream/tcp/tcp_normalizers.cc @@ -38,7 +38,7 @@ class TcpNormalizerFirst : public TcpNormalizer { public: TcpNormalizerFirst() - { my_name = "OS_First"; } + { my_name = "First"; } int handle_repeated_syn(TcpNormalizerState&, TcpSegmentDescriptor&) override; @@ -48,7 +48,7 @@ class TcpNormalizerLast : public TcpNormalizer { public: TcpNormalizerLast() - { my_name = "OS_Last"; } + { my_name = "Last"; } int handle_repeated_syn(TcpNormalizerState&, TcpSegmentDescriptor&) override; @@ -558,17 +558,17 @@ void TcpNormalizerFactory::initialize() { normalizers[Normalizer::Policy::FIRST] = new TcpNormalizerFirst; normalizers[Normalizer::Policy::LAST] = new TcpNormalizerLast; - normalizers[Normalizer::Policy::LINUX] = new TcpNormalizerLinux; - normalizers[Normalizer::Policy::OLD_LINUX] = new TcpNormalizerOldLinux; - normalizers[Normalizer::Policy::BSD] = new TcpNormalizerBSD; - normalizers[Normalizer::Policy::MACOS] = new TcpNormalizerMacOS; - normalizers[Normalizer::Policy::SOLARIS] = new TcpNormalizerSolaris; - normalizers[Normalizer::Policy::IRIX] = new TcpNormalizerIrix; - normalizers[Normalizer::Policy::HPUX11] = new TcpNormalizerHpux11; - normalizers[Normalizer::Policy::HPUX10] = new TcpNormalizerHpux10; - normalizers[Normalizer::Policy::WINDOWS] = new TcpNormalizerWindows; - normalizers[Normalizer::Policy::WINDOWS2K3] = new TcpNormalizerWindows2K3; - normalizers[Normalizer::Policy::VISTA] = new TcpNormalizerVista; + normalizers[Normalizer::Policy::OS_LINUX] = new TcpNormalizerLinux; + normalizers[Normalizer::Policy::OS_OLD_LINUX] = new TcpNormalizerOldLinux; + normalizers[Normalizer::Policy::OS_BSD] = new TcpNormalizerBSD; + normalizers[Normalizer::Policy::OS_MACOS] = new TcpNormalizerMacOS; + normalizers[Normalizer::Policy::OS_SOLARIS] = new TcpNormalizerSolaris; + normalizers[Normalizer::Policy::OS_IRIX] = new TcpNormalizerIrix; + normalizers[Normalizer::Policy::OS_HPUX11] = new TcpNormalizerHpux11; + normalizers[Normalizer::Policy::OS_HPUX10] = new TcpNormalizerHpux10; + normalizers[Normalizer::Policy::OS_WINDOWS] = new TcpNormalizerWindows; + normalizers[Normalizer::Policy::OS_WINDOWS2K3] = new TcpNormalizerWindows2K3; + normalizers[Normalizer::Policy::OS_VISTA] = new TcpNormalizerVista; normalizers[Normalizer::Policy::PROXY] = new TcpNormalizerProxy; normalizers[Normalizer::Policy::MISSED_3WHS] = new TcpNormalizerMissed3whs; } diff --git a/src/stream/tcp/tcp_overlap_resolver.cc b/src/stream/tcp/tcp_overlap_resolver.cc index fb5727965..8d7531f01 100644 --- a/src/stream/tcp/tcp_overlap_resolver.cc +++ b/src/stream/tcp/tcp_overlap_resolver.cc @@ -492,7 +492,7 @@ class TcpOverlapResolverLinux : public TcpOverlapResolver { public: TcpOverlapResolverLinux() - { overlap_policy = Overlap::Policy::LINUX; } + { overlap_policy = Overlap::Policy::OS_LINUX; } private: void insert_left_overlap(TcpOverlapState& tos) override @@ -509,7 +509,7 @@ class TcpOverlapResolverOldLinux : public TcpOverlapResolver { public: TcpOverlapResolverOldLinux() - { overlap_policy = Overlap::Policy::OLD_LINUX; } + { overlap_policy = Overlap::Policy::OS_OLD_LINUX; } private: void insert_left_overlap(TcpOverlapState& tos) override @@ -526,7 +526,7 @@ class TcpOverlapResolverBSD : public TcpOverlapResolver { public: TcpOverlapResolverBSD() - { overlap_policy = Overlap::Policy::BSD; } + { overlap_policy = Overlap::Policy::OS_BSD; } private: void insert_left_overlap(TcpOverlapState& tos) override @@ -543,7 +543,7 @@ class TcpOverlapResolverMacOS : public TcpOverlapResolver { public: TcpOverlapResolverMacOS() - { overlap_policy = Overlap::Policy::MACOS; } + { overlap_policy = Overlap::Policy::OS_MACOS; } private: void insert_left_overlap(TcpOverlapState& tos) override @@ -560,7 +560,7 @@ class TcpOverlapResolverSolaris : public TcpOverlapResolver { public: TcpOverlapResolverSolaris() - { overlap_policy = Overlap::Policy::SOLARIS; } + { overlap_policy = Overlap::Policy::OS_SOLARIS; } private: void insert_left_overlap(TcpOverlapState& tos) override @@ -577,7 +577,7 @@ class TcpOverlapResolverIrix : public TcpOverlapResolver { public: TcpOverlapResolverIrix() - { overlap_policy = Overlap::Policy::IRIX; } + { overlap_policy = Overlap::Policy::OS_IRIX; } private: void insert_left_overlap(TcpOverlapState& tos) override @@ -594,7 +594,7 @@ class TcpOverlapResolverHpux11 : public TcpOverlapResolver { public: TcpOverlapResolverHpux11() - { overlap_policy = Overlap::Policy::HPUX11; } + { overlap_policy = Overlap::Policy::OS_HPUX11; } private: void insert_left_overlap(TcpOverlapState& tos) override @@ -611,7 +611,7 @@ class TcpOverlapResolverHpux10 : public TcpOverlapResolver { public: TcpOverlapResolverHpux10() - { overlap_policy = Overlap::Policy::HPUX10; } + { overlap_policy = Overlap::Policy::OS_HPUX10; } private: void insert_left_overlap(TcpOverlapState& tos) override @@ -628,7 +628,7 @@ class TcpOverlapResolverWindows : public TcpOverlapResolver { public: TcpOverlapResolverWindows() - { overlap_policy = Overlap::Policy::WINDOWS; } + { overlap_policy = Overlap::Policy::OS_WINDOWS; } private: void insert_left_overlap(TcpOverlapState& tos) override @@ -645,7 +645,7 @@ class TcpOverlapResolverWindows2K3 : public TcpOverlapResolver { public: TcpOverlapResolverWindows2K3() - { overlap_policy = Overlap::Policy::WINDOWS2K3; } + { overlap_policy = Overlap::Policy::OS_WINDOWS2K3; } private: void insert_left_overlap(TcpOverlapState& tos) override @@ -662,7 +662,7 @@ class TcpOverlapResolverVista : public TcpOverlapResolver { public: TcpOverlapResolverVista() - { overlap_policy = Overlap::Policy::VISTA; } + { overlap_policy = Overlap::Policy::OS_VISTA; } private: void insert_left_overlap(TcpOverlapState& tos) override @@ -681,17 +681,17 @@ void TcpOverlapResolverFactory::initialize() { overlap_resolvers[Overlap::Policy::FIRST] = new TcpOverlapResolverFirst; overlap_resolvers[Overlap::Policy::LAST] = new TcpOverlapResolverLast; - overlap_resolvers[Overlap::Policy::LINUX] = new TcpOverlapResolverLinux; - overlap_resolvers[Overlap::Policy::OLD_LINUX] = new TcpOverlapResolverOldLinux; - overlap_resolvers[Overlap::Policy::BSD] = new TcpOverlapResolverBSD; - overlap_resolvers[Overlap::Policy::MACOS] = new TcpOverlapResolverMacOS; - overlap_resolvers[Overlap::Policy::SOLARIS] = new TcpOverlapResolverSolaris; - overlap_resolvers[Overlap::Policy::IRIX] = new TcpOverlapResolverIrix; - overlap_resolvers[Overlap::Policy::HPUX11] = new TcpOverlapResolverHpux11; - overlap_resolvers[Overlap::Policy::HPUX10] = new TcpOverlapResolverHpux10; - overlap_resolvers[Overlap::Policy::WINDOWS] = new TcpOverlapResolverWindows; - overlap_resolvers[Overlap::Policy::WINDOWS2K3] = new TcpOverlapResolverWindows2K3; - overlap_resolvers[Overlap::Policy::VISTA] = new TcpOverlapResolverVista; + overlap_resolvers[Overlap::Policy::OS_LINUX] = new TcpOverlapResolverLinux; + overlap_resolvers[Overlap::Policy::OS_OLD_LINUX] = new TcpOverlapResolverOldLinux; + overlap_resolvers[Overlap::Policy::OS_BSD] = new TcpOverlapResolverBSD; + overlap_resolvers[Overlap::Policy::OS_MACOS] = new TcpOverlapResolverMacOS; + overlap_resolvers[Overlap::Policy::OS_SOLARIS] = new TcpOverlapResolverSolaris; + overlap_resolvers[Overlap::Policy::OS_IRIX] = new TcpOverlapResolverIrix; + overlap_resolvers[Overlap::Policy::OS_HPUX11] = new TcpOverlapResolverHpux11; + overlap_resolvers[Overlap::Policy::OS_HPUX10] = new TcpOverlapResolverHpux10; + overlap_resolvers[Overlap::Policy::OS_WINDOWS] = new TcpOverlapResolverWindows; + overlap_resolvers[Overlap::Policy::OS_WINDOWS2K3] = new TcpOverlapResolverWindows2K3; + overlap_resolvers[Overlap::Policy::OS_VISTA] = new TcpOverlapResolverVista; } void TcpOverlapResolverFactory::term() diff --git a/src/stream/tcp/tcp_session.cc b/src/stream/tcp/tcp_session.cc index 529ffd026..915bb29eb 100644 --- a/src/stream/tcp/tcp_session.cc +++ b/src/stream/tcp/tcp_session.cc @@ -287,7 +287,7 @@ void TcpSession::check_flow_missed_3whs() void TcpSession::set_os_policy() { - assert(tcp_config->policy <= Normalizer::Policy::VISTA); + assert(tcp_config->policy <= Normalizer::Policy::OS_VISTA); Normalizer::Policy client_norm_policy = flow->ssn_policy ? static_cast( flow->ssn_policy ) : tcp_config->policy; diff --git a/src/stream/tcp/tcp_state_fin_wait1.cc b/src/stream/tcp/tcp_state_fin_wait1.cc index 63f9aa421..588974255 100644 --- a/src/stream/tcp/tcp_state_fin_wait1.cc +++ b/src/stream/tcp/tcp_state_fin_wait1.cc @@ -133,7 +133,7 @@ bool TcpStateFinWait1::check_for_window_slam(TcpSegmentDescriptor& tsd, TcpStrea { if ( SEQ_EQ(tsd.get_ack(), trk.get_snd_nxt() ) ) { - if ( (trk.normalizer.get_norm_policy() == Normalizer::Policy::WINDOWS) + if ( (trk.normalizer.get_norm_policy() == Normalizer::Policy::OS_WINDOWS) && (tsd.get_wnd() == 0)) { trk.session->tel.set_tcp_event(EVENT_WINDOW_SLAM); diff --git a/src/stream/tcp/tcp_state_mid_stream_sent.cc b/src/stream/tcp/tcp_state_mid_stream_sent.cc index 865038000..65c91d853 100644 --- a/src/stream/tcp/tcp_state_mid_stream_sent.cc +++ b/src/stream/tcp/tcp_state_mid_stream_sent.cc @@ -157,7 +157,7 @@ bool TcpStateMidStreamSent::check_for_window_slam(TcpSegmentDescriptor& tsd, Tcp { if ( SEQ_EQ(tsd.get_ack(), trk.get_snd_nxt() ) ) { - if ( (trk.normalizer.get_norm_policy() == Normalizer::Policy::WINDOWS) + if ( (trk.normalizer.get_norm_policy() == Normalizer::Policy::OS_WINDOWS) && (tsd.get_wnd() == 0)) { trk.session->tel.set_tcp_event(EVENT_WINDOW_SLAM); diff --git a/src/stream/tcp/test/tcp_normalizer_test.cc b/src/stream/tcp/test/tcp_normalizer_test.cc index da85d6d7a..ef99de0ef 100644 --- a/src/stream/tcp/test/tcp_normalizer_test.cc +++ b/src/stream/tcp/test/tcp_normalizer_test.cc @@ -108,7 +108,7 @@ TEST(tcp_normalizers, norm_policy) TcpSession* session = new TcpSessionMock( flow ); TcpNormalizerState tns; - for( norm_policy = Normalizer::Policy::OS_FIRST; norm_policy < Normalizer::Policy::MAX_NORM_POLICY; ++norm_policy ) + for( norm_policy = Normalizer::Policy::FIRST; norm_policy < Normalizer::Policy::MAX_NORM_POLICY; ++norm_policy ) { TcpNormalizer* normalizer = TcpNormalizerFactory::create( tns, norm_policy, session, session->client, session->server); @@ -127,14 +127,14 @@ TEST(tcp_normalizers, paws_fudge_config) TcpSession* session = new TcpSessionMock( flow ); TcpNormalizerState tns; - for( norm_policy = Normalizer::Policy::OS_FIRST; norm_policy < Normalizer::Policy::MAX_NORM_POLICY; ++norm_policy ) + for( norm_policy = Normalizer::Policy::FIRST; norm_policy < Normalizer::Policy::MAX_NORM_POLICY; ++norm_policy ) { TcpNormalizer* normalizer = TcpNormalizerFactory::create( tns, norm_policy, session, session->client, session->server); switch ( norm_policy ) { - case Normalizer::Policy::LINUX: + case Normalizer::Policy::OS_LINUX: CHECK( normalizer.get_paws_ts_fudge(tns) == 1 ); break; @@ -155,18 +155,18 @@ TEST(tcp_normalizers, paws_drop_zero_ts_config) TcpSession* session = new TcpSessionMock( flow ); TcpNormalizerState tns; - for( norm_policy = Normalizer::Policy::OS_FIRST; norm_policy < Normalizer::Policy::MAX_NORM_POLICY; ++norm_policy ) + for( norm_policy = Normalizer::Policy::FIRST; norm_policy < Normalizer::Policy::MAX_NORM_POLICY; ++norm_policy ) { TcpNormalizer* normalizer = TcpNormalizerFactory::create( tns, norm_policy, session, session->client, session->server ); switch ( norm_policy ) { - case Normalizer::Policy::OLD_LINUX: - case Normalizer::Policy::SOLARIS: - case Normalizer::Policy::WINDOWS: - case Normalizer::Policy::WINDOWS2K3: - case Normalizer::Policy::VISTA: + case Normalizer::Policy::OS_OLD_LINUX: + case Normalizer::Policy::OS_SOLARIS: + case Normalizer::Policy::OS_WINDOWS: + case Normalizer::Policy::OS_WINDOWS2K3: + case Normalizer::Policy::OS_VISTA: CHECK( !normalizer.is_paws_drop_zero_ts(tns) ); break; @@ -187,7 +187,7 @@ TEST(tcp_normalizers, norm_options_enabled) TcpSession* session = new TcpSessionMock( flow ); norm_enabled = true; - for( norm_policy = Normalizer::Policy::OS_FIRST; norm_policy < Normalizer::Policy::MAX_NORM_POLICY; ++norm_policy ) + for( norm_policy = Normalizer::Policy::FIRST; norm_policy < Normalizer::Policy::MAX_NORM_POLICY; ++norm_policy ) { TcpNormalizerState tns; TcpNormalizer* normalizer = TcpNormalizerFactory::create( @@ -204,7 +204,7 @@ TEST(tcp_normalizers, norm_options_enabled) } norm_enabled = false; - for( norm_policy = Normalizer::Policy::OS_FIRST; norm_policy < Normalizer::Policy::MAX_NORM_POLICY; ++norm_policy ) + for( norm_policy = Normalizer::Policy::FIRST; norm_policy < Normalizer::Policy::MAX_NORM_POLICY; ++norm_policy ) { TcpNormalizerState tns; TcpNormalizer* normalizer = TcpNormalizerFactory::create(