From: Josh <jrosenba@cisco.com>
Date: Mon, 27 Oct 2014 16:31:23 +0000 (-0700)
Subject: changing names in Snort2Lua
X-Git-Tag: 3.0.0-233~1321^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f376dfe289625ca02ce7e5ca0c55c95e5942ef3e;p=thirdparty%2Fsnort3.git

changing names in Snort2Lua
---

diff --git a/tools/snort2lua/config_states/config_paf_max.cc b/tools/snort2lua/config_states/config_paf_max.cc
index c373a02c3..94ba470cf 100644
--- a/tools/snort2lua/config_states/config_paf_max.cc
+++ b/tools/snort2lua/config_states/config_paf_max.cc
@@ -42,7 +42,6 @@ public:
 
 bool PafMax::convert(std::istringstream& data_stream)
 {
-    bool retval = true;
     int val;
 
     table_api.open_table("stream_tcp");
@@ -55,13 +54,28 @@ bool PafMax::convert(std::istringstream& data_stream)
             val = 1460;
         }
 
-        retval = table_api.add_option("max_pdu", val);
+        // FIXIT-H J  - this is a hack to ensure max_pdu is in
+        //              every configuratino file and does not
+        //              overwrite the stream_tcp table
+
+//      table_api.add_option("max_pdu", val);
+        data_api.add_comment("stream_tcp.max_pdu = " + std::to_string(val));
+
+        table_api.close_table();
+
+
+        if (!(data_stream >> val))
+            return true;
+
+
+        data_api.failed_conversion(data_stream, std::to_string(val));
     }
     else
-        data_api.failed_conversion(data_stream);
+    {
+        data_api.failed_conversion(data_stream, "option required!");
+    }
 
-    table_api.close_table();
-    return retval;
+    return false;
 }
 
 /**************************
diff --git a/tools/snort2lua/preprocessor_states/pps_http_inspect.cc b/tools/snort2lua/preprocessor_states/pps_http_inspect.cc
index 1d0e37ddd..aa7a1c825 100644
--- a/tools/snort2lua/preprocessor_states/pps_http_inspect.cc
+++ b/tools/snort2lua/preprocessor_states/pps_http_inspect.cc
@@ -60,7 +60,8 @@ bool HttpInspect::convert(std::istringstream& data_stream)
             return false;
         }
     }
-    table_api.open_table("http_inspect");
+    table_api.open_table("http_global");
+    table_api.add_diff_option_comment("http_inspect", "http_global");
 
 
 
diff --git a/tools/snort2lua/preprocessor_states/pps_http_inspect_server.cc b/tools/snort2lua/preprocessor_states/pps_http_inspect_server.cc
index e4282b875..07f96f7b3 100644
--- a/tools/snort2lua/preprocessor_states/pps_http_inspect_server.cc
+++ b/tools/snort2lua/preprocessor_states/pps_http_inspect_server.cc
@@ -72,11 +72,12 @@ bool HttpInspectServer::convert(std::istringstream& data_stream)
 
     if(!keyword.compare("default"))
     {
-        table_api.open_table("http_server");
+        table_api.open_table("http_inspect");
+        table_api.add_diff_option_comment("http_server", "http_inspect");
     }
     else
     {
-        std::string table_name = "http_server_" + std::to_string(binding_id);
+        std::string table_name = "http_inspect_" + std::to_string(binding_id);
         bind.set_use_name(table_name);
         table_api.open_table(table_name);
         binding_id++;