Pull request #4212: appid: Replaced warning log with logging api for CBD

Merge in SNORT/snort3 from ~BSACHDEV/snort3:log_fix_cbd to master

Squashed commit of the following:

commit b33392a114aa6f7a2b61265bd6062b563ddf45d9
Author: bsachdev <bsachdev@cisco.com>
Date:   Fri Feb 16 17:11:00 2024 -0500

    appid: Replaced warning log with logging api for CBD

diff --git a/src/network_inspectors/appid/appid_peg_counts.cc b/src/network_inspectors/appid/appid_peg_counts.cc
index a5ff699ce6397076dd70de16357352876603b919..9234ee196407abea15a24d9d2502ff70abe48fff 100644 (file)
--- a/src/network_inspectors/appid/appid_peg_counts.cc
+++ b/src/network_inspectors/appid/appid_peg_counts.cc
@@ -36,9 +36,11 @@
 
 #include "log/messages.h"
 #include "main/thread.h"
+#include "trace/trace.h"
 #include "utils/stats.h"
 
 #include "app_info_table.h"
+#include "appid_debug.h"
 
 using namespace snort;
 
@@ -90,7 +92,7 @@ public:
     {
         if (!peg_ids)
         {
-            WarningMessage("AppId peg counts thread created with no ids\n");
+            appid_log(nullptr, TRACE_WARNING_LEVEL, "AppId peg counts thread created with no ids\n");
             peg_ids = std::make_shared<AppIdPegCountIdInfo>();
         }
     }

diff --git a/src/network_inspectors/appid/test/appid_api_test.cc b/src/network_inspectors/appid/test/appid_api_test.cc
index 13914a0ca6fc1c9b97b9834e0dad41306d6afcdd..c9a887b64b73dcd757a0550558119f9ecafaace7 100644 (file)
--- a/src/network_inspectors/appid/test/appid_api_test.cc
+++ b/src/network_inspectors/appid/test/appid_api_test.cc
@@ -70,6 +70,8 @@ AppIdSessionApi::AppIdSessionApi(const AppIdSession*, const SfIp&) :
     StashGenericObject(STASH_GENERIC_OBJECT_APPID) {}
 }
 
+void appid_log(const snort::Packet*, unsigned char, char const*, ...) { }
+
 void AppIdModule::reset_stats() {}
 
 class DummyInspector : public snort::Inspector

diff --git a/src/network_inspectors/appid/test/appid_detector_test.cc b/src/network_inspectors/appid/test/appid_detector_test.cc
index ad5ef7e669c961a90c6664b76112480b0495ef7c..b97b99781c58583d5f710be3bb78ab2fc8480c92 100644 (file)
--- a/src/network_inspectors/appid/test/appid_detector_test.cc
+++ b/src/network_inspectors/appid/test/appid_detector_test.cc
@@ -49,6 +49,8 @@ void AppIdHttpSession::set_http_change_bits(AppidChangeBits&, HttpFieldIds) {}
 
 void AppIdModule::reset_stats() {}
 
+void appid_log(const snort::Packet*, unsigned char, char const*, ...) { }
+
 class TestDetector : public AppIdDetector
 {
 public:

diff --git a/src/network_inspectors/appid/test/appid_session_api_test.cc b/src/network_inspectors/appid/test/appid_session_api_test.cc
index e6c314e1dd3ea246b9d78e1e00544478ff0a1a02..af5093fbe2c6b2872e452aa1a624018fcff38b95 100644 (file)
--- a/src/network_inspectors/appid/test/appid_session_api_test.cc
+++ b/src/network_inspectors/appid/test/appid_session_api_test.cc
@@ -44,6 +44,8 @@ Inspector* InspectorManager::get_inspector(char const*, bool, const snort::Snort
     return nullptr;
 }
 
+void appid_log(const snort::Packet*, unsigned char, char const*, ...) { }
+
 namespace snort
 {
     unsigned get_instance_id()