Pull request #5032: appid: fix eve process handler event debug logging

Merge in SNORT/snort3 from ~RDEMPSTE/snort3:fix_deferred_trust to master

Squashed commit of the following:

commit 749e2e9e043a229ecdb534d0844efaf6c33d8df0
Author: Ron Dempster (rdempste) <rdempste@cisco.com>
Date:   Thu Oct 16 15:52:16 2025 -0400

    appid: fix eve process handler event debug logging

diff --git a/src/network_inspectors/appid/appid_eve_process_event_handler.cc b/src/network_inspectors/appid/appid_eve_process_event_handler.cc
index 6261762578cfe9b22cb74d3f3b55a4792eefba8b..c7e25101cec9b4eb6a44c8f56b180cedd9c97fd8 100644 (file)
--- a/src/network_inspectors/appid/appid_eve_process_event_handler.cc
+++ b/src/network_inspectors/appid/appid_eve_process_event_handler.cc
@@ -55,6 +55,8 @@ void AppIdEveProcessEventHandler::handle(DataEvent& event, Flow* flow)
 
         APPID_LOG(p, TRACE_DEBUG_LEVEL, "New AppId session at mercury event\n");
     }
+    else if (appidDebug->is_enabled())
+        appidDebug->activate(flow, asd, inspector.get_ctxt().config.log_all_sessions);
 
     if (!asd->get_session_flags(APPID_SESSION_DISCOVER_APP | APPID_SESSION_SPECIAL_MONITORED))
         return;

diff --git a/src/pub_sub/expect_events.h b/src/pub_sub/expect_events.h
index 0ec5180dcbf7ee3fddc63083ca4daca549316e06..dc09782b830c435092776626e0d4ac31564cd5be 100644 (file)
--- a/src/pub_sub/expect_events.h
+++ b/src/pub_sub/expect_events.h
@@ -40,8 +40,7 @@ struct Packet;
 class ExpectEvent : public snort::DataEvent
 {
 public:
-    ExpectEvent(const snort::Packet* ctrl_packet, snort::ExpectFlow* ef,
-        const snort::FlowData* fd)
+    ExpectEvent(const snort::Packet* ctrl_packet, snort::ExpectFlow* ef, const snort::FlowData* fd)
     {
         p = ctrl_packet;
         expect_flow = ef;
@@ -51,10 +50,10 @@ public:
     const snort::Packet* get_packet() const override
     { return p; }
 
-    snort::ExpectFlow* get_expect_flow()
+    snort::ExpectFlow* get_expect_flow() const
     { return expect_flow; }
 
-    const snort::FlowData* get_flow_data()
+    const snort::FlowData* get_flow_data() const
     { return flow_data; }
 
 private: