Merge pull request #2268 in SNORT/snort3 from ~MMATIRKO/snort3:rrt_check_fqn to master

Squashed commit of the following:

commit 73b94247a8aac83de7a1acc955c64b6eee022f12
Author: Michael Matirko <mmatirko@cisco.com>
Date:   Mon Jun 15 13:45:14 2020 -0400

    reload: check fqn before registering rrt

diff --git a/src/network_inspectors/appid/appid_module.cc b/src/network_inspectors/appid/appid_module.cc
index 15a5006827de0c742d537e48f3115dfd59ca1569..81699528d287761f9ae40cc433a5dc771a692f96 100644 (file)
--- a/src/network_inspectors/appid/appid_module.cc
+++ b/src/network_inspectors/appid/appid_module.cc
@@ -331,13 +331,16 @@ bool AppIdModule::begin(const char*, int, SnortConfig*)
     return true;
 }
 
-bool AppIdModule::end(const char*, int, SnortConfig* sc)
+bool AppIdModule::end(const char* fqn, int, SnortConfig* sc)
 {
     assert(config);
 
-    appid_rrt.memcap = config->memcap;
-    if ( Snort::is_reloading() )
-        sc->register_reload_resource_tuner(appid_rrt);
+    if ( strcmp(fqn, "appid") == 0 )
+    {
+        appid_rrt.memcap = config->memcap;
+        if ( Snort::is_reloading() )
+            sc->register_reload_resource_tuner(appid_rrt);
+    }
 
     if ( !config->app_detector_dir )
     {

diff --git a/src/network_inspectors/perf_monitor/perf_module.cc b/src/network_inspectors/perf_monitor/perf_module.cc
index 37296417d12062ac012842ebdd6da117f0faa377..5f773081f5ee99f84bc1e61284d462acfc8e0901 100644 (file)
--- a/src/network_inspectors/perf_monitor/perf_module.cc
+++ b/src/network_inspectors/perf_monitor/perf_module.cc
@@ -319,7 +319,7 @@ bool PerfMonModule::set(const char*, Value& v, SnortConfig*)
 
 bool PerfMonModule::begin(const char* fqn, int idx, SnortConfig*)
 {
-    if (strcmp(fqn, "perf_monitor") == 0)
+    if ( strcmp(fqn, "perf_monitor") == 0 )
     {
         assert(config == nullptr);
         config = new PerfConfig;
@@ -333,11 +333,14 @@ bool PerfMonModule::begin(const char* fqn, int idx, SnortConfig*)
 bool PerfMonModule::end(const char* fqn, int idx, SnortConfig* sc)
 {
 
-    perfmon_rrt.set_memcap(config->flowip_memcap);
-
-    if ( Snort::is_reloading() )
+    if ( strcmp(fqn, "perf_monitor") == 0 )
     {
-        sc->register_reload_resource_tuner(perfmon_rrt);
+        perfmon_rrt.set_memcap(config->flowip_memcap);
+
+        if ( Snort::is_reloading() )
+        {
+            sc->register_reload_resource_tuner(perfmon_rrt);
+        }
     }
 
     if ( idx != 0 && strcmp(fqn, "perf_monitor.modules") == 0 )