ip defrag fixes from Josh

diff --git a/ChangeLog b/ChangeLog
index ab2515ff53ebc365ca852345d5f866254f83c124..4efd64427a027e0c87866c1951b53b0c88028282 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@
 -- fixed ips classtype segfault on ctor after parse error
 -- new_http_inspect now gid 219 and other Tom Tweaks
 -- new_http_inspect reactiveated (no longer REG_TEST only)
+-- ip defrag fixes from Josh
 
 126
 -- pulled latest from tom

diff --git a/tools/snort2lua/rule_states/rule_pcre.cc b/tools/snort2lua/rule_states/rule_pcre.cc
index 61729418e0a0a13fae2eef8a5670b6bb8fe4629c..ffc685b62e82e9bcc7417ec5e078b2e8ff4db034 100644 (file)
--- a/tools/snort2lua/rule_states/rule_pcre.cc
+++ b/tools/snort2lua/rule_states/rule_pcre.cc
@@ -45,7 +45,7 @@ public:
 bool Pcre::convert(std::istringstream& data_stream)
 {
     std::string keyword;
-    bool retval = true;
+    //bool retval = true;  FIXIT-H-J
     bool sticky_buffer_set = false;
 
     char delim = '/';
@@ -128,7 +128,7 @@ bool Pcre::convert(std::istringstream& data_stream)
                 dlt_opt.append(1, c);
                 dlt_opt += "'";
                 rule_api.bad_rule(data_stream, dlt_opt);
-                retval = false;
+                //retval = false;  FIXIT-H-J
                 break;
             }
         }

diff --git a/tools/snort2lua/rule_states/rule_threshold.cc b/tools/snort2lua/rule_states/rule_threshold.cc
index f73887b0c87a5f3b607aa7cce05e1babf56fae4f..be8ab940f7d4760562ea2c395b1e07c5097f1afc 100644 (file)
--- a/tools/snort2lua/rule_states/rule_threshold.cc
+++ b/tools/snort2lua/rule_states/rule_threshold.cc
@@ -59,23 +59,23 @@ bool Threshold::convert(std::istringstream& data_stream)
     {
         std::string keyword;
         std::string val;
-        bool tmpval = true;
+        //bool tmpval = true;  FIXIT-H-J
         std::istringstream subopt_stream(value);
 
         if (!(subopt_stream >> keyword) || !(subopt_stream >> val))
             rule_api.bad_rule(data_stream, "threshold: " + keyword + " <missing_value>");
 
         else if (!(keyword.compare("count")))
-            tmpval = table_api.add_option("count", std::stoi(val));
+            /*tmpval =*/ table_api.add_option("count", std::stoi(val));
 
         else if (!(keyword.compare("seconds")))
-            tmpval = table_api.add_option("seconds", std::stoi(val));
+            /*tmpval =*/ table_api.add_option("seconds", std::stoi(val));
 
         else if (!(keyword.compare("type")))
-            tmpval = table_api.add_option("type", val);
+            /*tmpval =*/ table_api.add_option("type", val);
 
         else if (!(keyword.compare("track")))
-            tmpval = table_api.add_option("track", val);
+            /*tmpval =*/ table_api.add_option("track", val);
 
         else
             rule_api.bad_rule(data_stream, "threshold: " + keyword);