From: Tom Peters (thopeter) <thopeter@cisco.com>
Date: Tue, 24 Aug 2021 17:52:30 +0000 (+0000)
Subject: Merge pull request #3029 in SNORT/snort3 from ~KATHARVE/snort3:norm_config_fix to... 
X-Git-Tag: 3.1.11.0~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50267162989ba80caf3c8ba8451418391415b8bf;p=thirdparty%2Fsnort3.git

Merge pull request #3029 in SNORT/snort3 from ~KATHARVE/snort3:norm_config_fix to master

Squashed commit of the following:

commit 72bc20166071cdb6b4b19e97ad1f048793f61887
Author: Katura Harvey <katharve@cisco.com>
Date:   Thu Aug 12 17:11:44 2021 -0400

    normalize: remove tcp.trim config
---

diff --git a/src/network_inspectors/normalize/norm_module.cc b/src/network_inspectors/normalize/norm_module.cc
index 0d2cca8d4..c4ef1a672 100644
--- a/src/network_inspectors/normalize/norm_module.cc
+++ b/src/network_inspectors/normalize/norm_module.cc
@@ -137,9 +137,6 @@ static const Parameter norm_tcp_params[] =
     { "trim_mss", Parameter::PT_BOOL, nullptr, "false",
       "trim data to MSS" },
 
-    { "trim", Parameter::PT_BOOL, nullptr, "false",
-      "enable all of the TCP trim options" },
-
     { "opts", Parameter::PT_BOOL, nullptr, "false",
       "clear all options except mss, wscale, timestamp, and any explicitly allowed" },
 
@@ -284,13 +281,6 @@ bool NormalizeModule::set_tcp(const char*, const Value& v, SnortConfig*)
     else if ( v.is("trim_mss") )
         Norm_Set(&config, NORM_TCP_TRIM_MSS, v.get_bool());
 
-    else if ( v.is("trim") )
-    {
-        Norm_Set(&config, NORM_TCP_TRIM_SYN, v.get_bool());
-        Norm_Set(&config, NORM_TCP_TRIM_RST, v.get_bool());
-        Norm_Set(&config, NORM_TCP_TRIM_WIN, v.get_bool());
-        Norm_Set(&config, NORM_TCP_TRIM_MSS, v.get_bool());
-    }
     else if ( v.is("ecn") )
     {
         if ( !strcmp(v.get_string(), "packet") )
diff --git a/tools/snort2lua/preprocessor_states/pps_normalizers.cc b/tools/snort2lua/preprocessor_states/pps_normalizers.cc
index 7cea27106..d7628ac66 100644
--- a/tools/snort2lua/preprocessor_states/pps_normalizers.cc
+++ b/tools/snort2lua/preprocessor_states/pps_normalizers.cc
@@ -169,7 +169,7 @@ bool TcpNormalizer::convert(std::istringstream& data_stream)
             table_api.add_option("ips", true);
 
         else if (keyword == "trim")
-            table_api.add_option("trim", true);
+            table_api.add_deleted_comment(keyword);
 
         else if (keyword == "opts")
             table_api.add_option("opts", true);