From: Josh <jrosenba@cisco.com>
Date: Mon, 8 Dec 2014 19:53:31 +0000 (-0600)
Subject: Snort2Lua can now convert Snort's  max_ip6_extensions
X-Git-Tag: 3.0.0-233~1094
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08e3c6c5d79fab008597959b2adee2bd7599622b;p=thirdparty%2Fsnort3.git

Snort2Lua can now convert Snort's  max_ip6_extensions
---

diff --git a/tools/snort2lua/config_states/config_api.cc b/tools/snort2lua/config_states/config_api.cc
index ca2e2d2d8..55c954bcc 100644
--- a/tools/snort2lua/config_states/config_api.cc
+++ b/tools/snort2lua/config_states/config_api.cc
@@ -95,6 +95,7 @@ extern const ConvertMap* log_ipv6_extra_data_map;
 extern const ConvertMap* logdir_map;
 extern const ConvertMap* max_attribute_hosts_map;
 extern const ConvertMap* max_attribute_services_per_host_map;
+extern const ConvertMap* max_ip6_extensions_map;
 extern const ConvertMap* max_metadata_services_map;
 extern const ConvertMap* max_mpls_labelchain_len_map;
 extern const ConvertMap* mpls_payload_type_map;
@@ -212,6 +213,7 @@ const std::vector<const ConvertMap*> config_api =
     min_ttl_map,
     max_attribute_hosts_map,
     max_attribute_services_per_host_map,
+    max_ip6_extensions_map,
     max_metadata_services_map,
     max_mpls_labelchain_len_map,
     mpls_payload_type_map,
diff --git a/tools/snort2lua/config_states/config_one_int_option.cc b/tools/snort2lua/config_states/config_one_int_option.cc
index fd34a6bd8..66e40a5a4 100644
--- a/tools/snort2lua/config_states/config_one_int_option.cc
+++ b/tools/snort2lua/config_states/config_one_int_option.cc
@@ -173,6 +173,19 @@ static const ConvertMap max_attribute_services_per_host_api =
 
 const ConvertMap* max_attribute_services_per_host_map = &max_attribute_services_per_host_api;
 
+/*************************************************
+ *************  max_ip6_extensions  **************
+ *************************************************/
+
+static const std::string max_ip6_extensions = "max_ip6_extensions";
+static const ConvertMap max_ip6_extensions_api =
+{
+    max_ip6_extensions,
+    config_int_ctor<&max_ip6_extensions, &network>,
+};
+
+const ConvertMap* max_ip6_extensions_map = &max_ip6_extensions_api;
+
 /*************************************************
  *************  max_attribute_hosts  *************
  *************************************************/
diff --git a/tools/snort2lua/config_states/config_ppm.cc b/tools/snort2lua/config_states/config_ppm.cc
index 73a02e07d..4b4f8c833 100644
--- a/tools/snort2lua/config_states/config_ppm.cc
+++ b/tools/snort2lua/config_states/config_ppm.cc
@@ -167,9 +167,7 @@ bool Ppm::convert(std::istringstream& data_stream)
  **************************/
 
 static ConversionState* ctor(Converter& c)
-{
-    return new Ppm(c);
-}
+{ return new Ppm(c); }
 
 static const ConvertMap config_ppm_api =
 {
diff --git a/tools/snort2lua/config_states/config_response.cc b/tools/snort2lua/config_states/config_response.cc
index 8aed130ff..5c68f7a84 100644
--- a/tools/snort2lua/config_states/config_response.cc
+++ b/tools/snort2lua/config_states/config_response.cc
@@ -80,9 +80,7 @@ bool Response::convert(std::istringstream& data_stream)
  **************************/
 
 static ConversionState* ctor(Converter& c)
-{
-    return new Response(c);
-}
+{ return new Response(c); }
 
 static const ConvertMap response_api =
 {
diff --git a/tools/snort2lua/tests/snort.conf.in b/tools/snort2lua/tests/snort.conf.in
index 2a64e114b..23e867c0b 100644
--- a/tools/snort2lua/tests/snort.conf.in
+++ b/tools/snort2lua/tests/snort.conf.in
@@ -246,6 +246,8 @@ config dirty_pig:
 config enable_gtp
 config vlan_agnostic
 config file: type_id,  signature,  file_type_depth   104800,  file_signature_depth  0  , show_data_depth 1,  file_block_timeout 60, file_lookup_timeout 30
+config max_ip6_extensions:  3
+config max_ip6_extensions:9
 #config file: file_capture_memcap 1024, file_capture_max 2048, file_capture_min 512,file_capture_block_size 8192
 
 config policy_mode: tap