Merge pull request #1884 in SNORT/snort3 from ~MASHASAN/snort3:verbose_logs to master

Squashed commit of the following:

commit 57cb51f8838f06da64b8891bca9a08321f05c60e
Author: Masud Hasan <mashasan@cisco.com>
Date:   Fri Dec 6 14:19:18 2019 -0500

    snort: Adding some verbose logs for appid, file_id, and reputation inspectors

diff --git a/src/file_api/file_flows.cc b/src/file_api/file_flows.cc
index e77995ecda833e341a4d25b43d20523612d278b9..205a38c7291ddf84d42a866f5ea2bb13466fba55 100644 (file)
--- a/src/file_api/file_flows.cc
+++ b/src/file_api/file_flows.cc
@@ -30,6 +30,7 @@
 #include "file_flows.h"
 
 #include "detection/detection_engine.h"
+#include "log/messages.h"
 #include "main/snort_config.h"
 #include "managers/inspector_manager.h"
 #include "protocols/packet.h"
@@ -373,6 +374,19 @@ bool FileInspect::configure(SnortConfig*)
     return true;
 }
 
+void FileInspect::show(SnortConfig*)
+{
+    if (!config)
+        return;
+
+    LogMessage("%s\n", FILE_ID_NAME);
+    LogMessage("    capture_memcap: %zu MB\n", config->capture_memcap);
+    LogMessage("    capture_max_size: %zu bytes\n", config->capture_max_size);
+    LogMessage("    capture_min_size: %zu bytes\n", config->capture_min_size);
+    LogMessage("    lookup_timeout: %zu secs\n", config->file_lookup_timeout);
+    LogMessage("\n");
+}
+
 static Module* mod_ctor()
 { return new FileIdModule; }
 

diff --git a/src/file_api/file_flows.h b/src/file_api/file_flows.h
index a7268ff4976be4e65c465c796fa8a4b391d2cd23..1899a42cb72a42d1887070ca36e62f521b84f2de 100644 (file)
--- a/src/file_api/file_flows.h
+++ b/src/file_api/file_flows.h
@@ -47,6 +47,7 @@ public:
     ~FileInspect() override;
     void eval(Packet*) override { }
     bool configure(SnortConfig*) override;
+    void show(SnortConfig*) override;
     FileConfig* config;
 };
 

diff --git a/src/network_inspectors/appid/appid_inspector.cc b/src/network_inspectors/appid/appid_inspector.cc
index 7a9091dbffc56b942fd47b911e3eeab61a199eb5..b7e1b2361b64e394116a6f5229791c290aa1f472 100644 (file)
--- a/src/network_inspectors/appid/appid_inspector.cc
+++ b/src/network_inspectors/appid/appid_inspector.cc
@@ -135,7 +135,7 @@ bool AppIdInspector::configure(SnortConfig* sc)
 
 void AppIdInspector::show(SnortConfig*)
 {
-    LogMessage("AppId Configuration\n");
+    LogMessage("%s\n", MOD_NAME);
 
     LogMessage("    Detector Path:          %s\n", config->app_detector_dir);
     LogMessage("    appStats Logging:       %s\n", config->stats_logging_enabled ? "enabled" :
@@ -145,6 +145,7 @@ void AppIdInspector::show(SnortConfig*)
         config->app_stats_rollover_size);
     LogMessage("    appStats Rollover time: %lu secs\n",
         config->app_stats_rollover_time);
+    LogMessage("    memcap:                 %zu bytes\n", config->memcap);
     LogMessage("\n");
 }
 

diff --git a/src/network_inspectors/reputation/reputation_inspect.cc b/src/network_inspectors/reputation/reputation_inspect.cc
index d332976910de5c3cb9b426e75b98819e2134adc2..fdb671d30bf0475cb8c875eb808d051b78010f47 100644 (file)
--- a/src/network_inspectors/reputation/reputation_inspect.cc
+++ b/src/network_inspectors/reputation/reputation_inspect.cc
@@ -89,6 +89,7 @@ static void print_reputation_conf(ReputationConfig* config)
 {
     assert(config);
 
+    LogMessage("%s\n", REPUTATION_NAME);
     print_iplist_stats(config);
 
     LogMessage("    Memcap: %d %s \n",