Merge pull request #1958 in SNORT/snort3 from ~DERAMADA/snort3:h2i_http2_w_http_rules...

Squashed commit of the following:

commit b09dd25c6ca83b761ceedfc2616d4ac69cc2450f
Author: deramada <deramada@cisco.com>
Date:   Wed Jan 22 08:58:33 2020 -0500

    parser: add service http2 to http rules

diff --git a/src/main/modules.cc b/src/main/modules.cc
index 76cf6a161c7201d91a1d7589c09f36c784967f50..568966fbaed772a58c14981bf41e9efc6981db19 100644 (file)
--- a/src/main/modules.cc
+++ b/src/main/modules.cc
@@ -1098,7 +1098,7 @@ static const Parameter attribute_table_params[] =
     { "max_services_per_host", Parameter::PT_INT, "1:65535", "8",
       "maximum number of services per host entry in attribute table" },
 
-    { "max_metadata_services", Parameter::PT_INT, "1:255", "8",
+    { "max_metadata_services", Parameter::PT_INT, "1:255", "9",
       "maximum number of services in rule" },
 
     { nullptr, Parameter::PT_MAX, nullptr, nullptr, nullptr }

diff --git a/src/parser/parse_conf.cc b/src/parser/parse_conf.cc
index 9d18d604c03a6072d7a62f56bb5492d46f68edf5..c1a69c7e5d7aaefd68c42bd92f34b1af4400936e 100644 (file)
--- a/src/parser/parse_conf.cc
+++ b/src/parser/parse_conf.cc
@@ -252,6 +252,12 @@ void add_service_to_otn(SnortConfig* sc, OptTreeNode* otn, const char* svc_name)
         return;
     }
 
+    if ( !strcmp(svc_name, "http") )
+    {
+        add_service_to_otn(sc, otn, "http2");
+        svc_name = "http";
+    }
+
     if (otn->sigInfo.num_services >= sc->max_metadata_services)
     {
         ParseError("too many service's specified for rule, can't add %s", svc_name);

diff --git a/src/target_based/sftarget_reader.h b/src/target_based/sftarget_reader.h
index 101f5d8e20360573d4edb09ecc83e35cf4d36c2b..7d34d696a62cb91310962bf7020f5155c3ba68c0 100644 (file)
--- a/src/target_based/sftarget_reader.h
+++ b/src/target_based/sftarget_reader.h
@@ -28,7 +28,7 @@
 
 #define DEFAULT_MAX_ATTRIBUTE_HOSTS   10000
 #define DEFAULT_MAX_ATTRIBUTE_SERVICES_PER_HOST 100
-#define DEFAULT_MAX_METADATA_SERVICES     8
+#define DEFAULT_MAX_METADATA_SERVICES     9
 
 #define MAX_MAX_ATTRIBUTE_HOSTS   (512 * 1024)
 #define MIN_MAX_ATTRIBUTE_HOSTS    32