Merge pull request #1285 in SNORT/snort3 from merge_6_2_3_release_v2 to master

Squashed commit of the following:

commit d8a55035b9dd8e0c36337c673f712dfced25d0de
Author: Steve Chew <stechew@cisco.com>
Date:   Wed Jun 20 23:23:06 2018 +0530

    Snort2lua: Handle sidechannel config.

diff --git a/tools/snort2lua/config_states/config_api.cc b/tools/snort2lua/config_states/config_api.cc
index 94e2aa54bc5e231b4fd715698d89274b2010db5a..b2e3ef3ac2c0e04846c2919380f91835966e3725 100644 (file)
--- a/tools/snort2lua/config_states/config_api.cc
+++ b/tools/snort2lua/config_states/config_api.cc
@@ -130,6 +130,7 @@ extern const ConvertMap* response_map;
 extern const ConvertMap* set_gid_map;
 extern const ConvertMap* set_uid_map;
 extern const ConvertMap* show_year_map;
+extern const ConvertMap* sidechannel_map;
 extern const ConvertMap* snaplen_map;
 extern const ConvertMap* so_rule_memcap_map;
 extern const ConvertMap* stateful_map;
@@ -249,6 +250,7 @@ const std::vector<const ConvertMap*> config_api =
     set_gid_map,
     set_uid_map,
     show_year_map,
+    sidechannel_map,
     snaplen_map,
     so_rule_memcap_map,
     stateful_map,

diff --git a/tools/snort2lua/config_states/config_deleted.cc b/tools/snort2lua/config_states/config_deleted.cc
index fcd607645953d598a8e69636f779d2155042df81..ba777ced8dad8efa4c0f159ff0afb2bf1fc8119a 100644 (file)
--- a/tools/snort2lua/config_states/config_deleted.cc
+++ b/tools/snort2lua/config_states/config_deleted.cc
@@ -570,4 +570,20 @@ static const ConvertMap protected_content_api =
 };
 
 const ConvertMap* protected_content_map = &protected_content_api;
+
+/*************************************************
+ *************  sidechannel ****************
+ *************************************************/
+
+// FIXIT-H: This is temporary and needs to be translated to an appropriate `side_channel = {}`
+
+static const std::string sidechannel = "sidechannel";
+static const ConvertMap sidechannel_api =
+{
+    sidechannel,
+    deleted_ctor<& sidechannel>,
+};
+
+const ConvertMap* sidechannel_map = &sidechannel_api;
+
 } // namespace config

diff --git a/tools/snort2lua/keyword_states/keywords_api.cc b/tools/snort2lua/keyword_states/keywords_api.cc
index c908ab376891386593331f4e8227b9b89dcd9102..043b0c1e5ef8a10ebb41cfeedb8bc9ef355b181f 100644 (file)
--- a/tools/snort2lua/keyword_states/keywords_api.cc
+++ b/tools/snort2lua/keyword_states/keywords_api.cc
@@ -48,6 +48,7 @@ extern const ConvertMap* rule_state_map;
 extern const ConvertMap* ruletype_map;
 extern const ConvertMap* sblock_map;
 extern const ConvertMap* sdrop_map;
+extern const ConvertMap* sidechannel_map;
 extern const ConvertMap* suppress_map;
 extern const ConvertMap* threshold_map;
 extern const ConvertMap* var_map;
@@ -81,6 +82,7 @@ const std::vector<const ConvertMap*> keywords_api =
     ruletype_map,
     sblock_map,
     sdrop_map,
+    sidechannel_map,
     suppress_map,
     threshold_map,
     var_map,

diff --git a/tools/snort2lua/keyword_states/kws_deleted.cc b/tools/snort2lua/keyword_states/kws_deleted.cc
index 45ac3744cdd45dac2eebd5b4e45e386716f37675..992ccc7f64e41c9331fda16ba0cc9e84d743ca7e 100644 (file)
--- a/tools/snort2lua/keyword_states/kws_deleted.cc
+++ b/tools/snort2lua/keyword_states/kws_deleted.cc
@@ -59,8 +59,8 @@ static ConversionState* deleted_ctor(Converter& c)
 /*************************************************
  *************  dynamicoutput ****************
  *************************************************/
-
 static const std::string dynamicoutput = "dynamicoutput";
+
 static const ConvertMap dynamicoutput_api =
 {
     dynamicoutput,
@@ -68,4 +68,18 @@ static const ConvertMap dynamicoutput_api =
 };
 
 const ConvertMap* dynamicoutput_map = &dynamicoutput_api;
+
+/*************************************************
+ *************  sidechannel ****************
+ *************************************************/
+static const std::string sidechannel = "sidechannel";
+
+static const ConvertMap sidechannel_api =
+{
+    sidechannel,
+    deleted_ctor<&sidechannel>,
+};
+
+const ConvertMap* sidechannel_map = &sidechannel_api;
+
 } // namespace keywords