Merge pull request #1509 in SNORT/snort3 from ~DDAHIPHA/snort3:app_stats_period_test...

Squashed commit of the following:

commit 30a653574446dbe2742331f7f1903a3b35cc3469
Author: Devendra Dahiphale <ddahipha@cisco.com>
Date:   Sun Feb 10 21:01:22 2019 -0500

    appid: set a range for app_stats_period parameter

diff --git a/src/network_inspectors/appid/appid_config.h b/src/network_inspectors/appid/appid_config.h
index d7386f90231b68df52bee0ccf0d327434ea296f2..fc6809a1cf4e7e8a5251462159e2a3def5c21021 100644 (file)
--- a/src/network_inspectors/appid/appid_config.h
+++ b/src/network_inspectors/appid/appid_config.h
@@ -72,7 +72,7 @@ public:
     uint32_t first_decrypted_packet_debug = 0;
 #endif
     bool stats_logging_enabled = false;
-    unsigned long app_stats_period = 0;
+    unsigned long app_stats_period = 300;
     unsigned long app_stats_rollover_size = 0;
     unsigned long app_stats_rollover_time = 0;
     const char* app_detector_dir = nullptr;

diff --git a/src/network_inspectors/appid/appid_module.cc b/src/network_inspectors/appid/appid_module.cc
index 6c6e2af29ae4c41285d12bb50fd68cef2f77ecac..2ecad659f382d819a40df48e83fcbdcade727771 100644 (file)
--- a/src/network_inspectors/appid/appid_module.cc
+++ b/src/network_inspectors/appid/appid_module.cc
@@ -64,7 +64,7 @@ static const Parameter s_params[] =
       "disregard - not implemented" },  // FIXIT-M implement or delete appid.memcap
     { "log_stats", Parameter::PT_BOOL, nullptr, "false",
       "enable logging of appid statistics" },
-    { "app_stats_period", Parameter::PT_INT, "0:max32", "300",
+    { "app_stats_period", Parameter::PT_INT, "1:max32", "300",
       "time period for collecting and logging appid statistics" },
     { "app_stats_rollover_size", Parameter::PT_INT, "0:max32", "20971520",
       "max file size for appid stats before rolling over the log file" },