From: Bhumika Sachdeva (bsachdev) <bsachdev@cisco.com>
Date: Mon, 26 Feb 2024 20:54:59 +0000 (+0000)
Subject: Pull request #4212: appid: Replaced warning log with logging api for CBD
X-Git-Tag: 3.1.82.0~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6dfa78b1cd467c14c4db2c4f83d80c289614865a;p=thirdparty%2Fsnort3.git

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 a5ff699ce..9234ee196 100644
--- 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 13914a0ca..c9a887b64 100644
--- 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 ad5ef7e66..b97b99781 100644
--- 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 e6c314e1d..af5093fbe 100644
--- 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()