From: Russ Combs (rucombs) Date: Wed, 10 Feb 2016 17:14:55 +0000 (-0500) Subject: Merge pull request #251 in SNORT/snort3 from cwaxman_regfix to master X-Git-Tag: 3.0.0-233~622 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=142eb7ca35440416d5b83641f36f0b53206ccc68;p=thirdparty%2Fsnort3.git Merge pull request #251 in SNORT/snort3 from cwaxman_regfix to master Squashed commit of the following: commit 2a8d7fa86cb60d82fca5defb93b237b684455c0a Author: Carter Waxman Date: Wed Feb 10 11:27:56 2016 -0500 fixed unit test with normalize modes commit d8670a05a9aee91e27c96d64038676e272e23732 Author: Carter Waxman Date: Tue Feb 9 16:23:36 2016 -0500 removed NORM_MODE_OFF --- diff --git a/src/network_inspectors/normalize/normalize.cc b/src/network_inspectors/normalize/normalize.cc index 996792053..26f746297 100644 --- a/src/network_inspectors/normalize/normalize.cc +++ b/src/network_inspectors/normalize/normalize.cc @@ -228,8 +228,7 @@ NormMode Normalize_GetMode(NormFlags nf) else if ( mode == POLICY_MODE__INLINE_TEST ) return NORM_MODE_TEST; } - - return NORM_MODE_OFF; + return NORM_MODE_TEST; } void Normalizer::show(SnortConfig* sc) diff --git a/src/network_inspectors/normalize/normalize.h b/src/network_inspectors/normalize/normalize.h index 8be795561..a461351ef 100644 --- a/src/network_inspectors/normalize/normalize.h +++ b/src/network_inspectors/normalize/normalize.h @@ -64,9 +64,8 @@ enum NormFlags enum NormMode : int8_t { - NORM_MODE_OFF, - NORM_MODE_TEST, NORM_MODE_ON, + NORM_MODE_TEST, NORM_MODE_MAX }; diff --git a/src/stream/tcp/tcp_reassemblers.cc b/src/stream/tcp/tcp_reassemblers.cc index eda3c8547..3ff034875 100644 --- a/src/stream/tcp/tcp_reassemblers.cc +++ b/src/stream/tcp/tcp_reassemblers.cc @@ -342,7 +342,7 @@ public: TcpReassemblerProxy(TcpSession* session, TcpTracker* tracker, bool server) : TcpReassemblerFirst(session, tracker, server) { - tcp_ips_data = NORM_MODE_OFF; + tcp_ips_data = NORM_MODE_TEST; } private: diff --git a/src/stream/tcp/tcp_session.cc b/src/stream/tcp/tcp_session.cc index cd2a020d9..ed8862735 100644 --- a/src/stream/tcp/tcp_session.cc +++ b/src/stream/tcp/tcp_session.cc @@ -922,7 +922,7 @@ void TcpSession::handle_data_on_syn(TcpSegmentDescriptor& tsd) // remove data on SYN listener->normalizer->trim_syn_payload(tsd); - if (Normalize_GetMode(NORM_TCP_TRIM_SYN) == NORM_MODE_OFF) + if (Normalize_GetMode(NORM_TCP_TRIM_SYN) != NORM_MODE_ON) { DebugMessage(DEBUG_STREAM_STATE, "Got data on SYN packet, not processing it\n"); tel.set_tcp_event(EVENT_DATA_ON_SYN); diff --git a/src/stream/tcp/test/tcp_normalizer_test.cc b/src/stream/tcp/test/tcp_normalizer_test.cc index bbf456590..0de34ab97 100644 --- a/src/stream/tcp/test/tcp_normalizer_test.cc +++ b/src/stream/tcp/test/tcp_normalizer_test.cc @@ -30,7 +30,6 @@ NormMode mockNormMode = NORM_MODE_ON; bool norm_enabled = true; -THREAD_LOCAL SFBASE sfBase; THREAD_LOCAL TcpStats tcpStats; THREAD_LOCAL void *snort_conf = nullptr; @@ -70,7 +69,7 @@ uint8_t TcpSession::missing_in_reassembled(unsigned char){ return 0; } class TcpSessionMock : public TcpSession { public: - TcpSessionMock( Flow* flow ) : TcpSession( flow ) { } + TcpSessionMock( Flow* flow ) : TcpSession( flow ), client( true ), server( false ) { } ~TcpSessionMock( void ) { } TcpTracker client; @@ -96,7 +95,7 @@ NormMode Normalize_GetMode(NormFlags ) if( norm_enabled ) return mockNormMode; else - return NORM_MODE_OFF; + return NORM_MODE_TEST; } TEST_GROUP(tcp_normalizers) @@ -121,8 +120,8 @@ TEST(tcp_normalizers, os_policy) for( os_policy = StreamPolicy::OS_FIRST; os_policy <= StreamPolicy::OS_PROXY; ++os_policy ) { - TcpNormalizer* normalizer = TcpNormalizerFactory::create( os_policy, session, - &session->client, &session->server ); + TcpNormalizer* normalizer = TcpNormalizerFactory::create( session, os_policy, + session->client, session->server ); CHECK( normalizer->get_os_policy() == os_policy ); delete normalizer; @@ -140,8 +139,8 @@ TEST(tcp_normalizers, paws_fudge_config) for( os_policy = StreamPolicy::OS_FIRST; os_policy <= StreamPolicy::OS_PROXY; ++os_policy ) { - TcpNormalizer* normalizer = TcpNormalizerFactory::create( os_policy, session, - &session->client, &session->server ); + TcpNormalizer* normalizer = TcpNormalizerFactory::create( session, os_policy, + session->client, session->server ); switch ( os_policy ) { @@ -169,8 +168,8 @@ TEST(tcp_normalizers, paws_drop_zero_ts_config) for( os_policy = StreamPolicy::OS_FIRST; os_policy <= StreamPolicy::OS_PROXY; ++os_policy ) { - TcpNormalizer* normalizer = TcpNormalizerFactory::create( os_policy, session, - &session->client, &session->server ); + TcpNormalizer* normalizer = TcpNormalizerFactory::create( session, os_policy, + session->client, session->server ); switch ( os_policy ) { @@ -203,8 +202,8 @@ TEST(tcp_normalizers, norm_options_enabled) norm_enabled = true; for( os_policy = StreamPolicy::OS_FIRST; os_policy <= StreamPolicy::OS_PROXY; ++os_policy ) { - TcpNormalizer* normalizer = TcpNormalizerFactory::create( os_policy, session, - &session->client, &session->server ); + TcpNormalizer* normalizer = TcpNormalizerFactory::create( session, os_policy, + session->client, session->server ); CHECK( normalizer->get_opt_block() == NORM_MODE_ON ); CHECK( normalizer->get_strip_ecn() == NORM_MODE_ON ); @@ -221,16 +220,16 @@ TEST(tcp_normalizers, norm_options_enabled) norm_enabled = false; for( os_policy = StreamPolicy::OS_FIRST; os_policy <= StreamPolicy::OS_PROXY; ++os_policy ) { - TcpNormalizer* normalizer = TcpNormalizerFactory::create( os_policy, session, - &session->client, &session->server ); - - CHECK( normalizer->get_opt_block() == NORM_MODE_OFF ); - CHECK( normalizer->get_strip_ecn() == NORM_MODE_OFF ); - CHECK( normalizer->get_tcp_block() == NORM_MODE_OFF ); - CHECK( normalizer->get_trim_syn() == NORM_MODE_OFF ); - CHECK( normalizer->get_trim_rst() == NORM_MODE_OFF ); - CHECK( normalizer->get_trim_mss() == NORM_MODE_OFF ); - CHECK( normalizer->get_trim_win() == NORM_MODE_OFF ); + TcpNormalizer* normalizer = TcpNormalizerFactory::create( session, os_policy, + session->client, session->server ); + + CHECK( normalizer->get_opt_block() == NORM_MODE_TEST ); + CHECK( normalizer->get_strip_ecn() == NORM_MODE_TEST ); + CHECK( normalizer->get_tcp_block() == NORM_MODE_TEST ); + CHECK( normalizer->get_trim_syn() == NORM_MODE_TEST ); + CHECK( normalizer->get_trim_rst() == NORM_MODE_TEST ); + CHECK( normalizer->get_trim_mss() == NORM_MODE_TEST ); + CHECK( normalizer->get_trim_win() == NORM_MODE_TEST ); CHECK( !normalizer->is_tcp_ips_enabled() ); delete normalizer; }