From: Umang Sharma (umasharm) <umasharm@cisco.com>
Date: Fri, 7 Jun 2024 14:56:43 +0000 (+0000)
Subject: Pull request #4339: appid: using different api for picking appids
X-Git-Tag: 3.3.0.0~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e32f6b391ed684bfedfef4c6dbdc59054522a29;p=thirdparty%2Fsnort3.git

Pull request #4339: appid: using different api for picking appids

Merge in SNORT/snort3 from ~UMASHARM/snort3:appid_profiler_api to master

Squashed commit of the following:

commit 023c07e878b7a4668b99fd464263e022166c2ce6
Author: Umang Sharma <umasharm@cisco.com>
Date:   Mon Jun 3 21:52:58 2024 -0400

    appid: using different api for picking appids for appid cpu profiler
---

diff --git a/src/network_inspectors/appid/appid_session.cc b/src/network_inspectors/appid/appid_session.cc
index 4a338e3b8..e5cf84dcc 100644
--- a/src/network_inspectors/appid/appid_session.cc
+++ b/src/network_inspectors/appid/appid_session.cc
@@ -141,7 +141,7 @@ AppIdSession::~AppIdSession()
      // Skip sessions using old odp context after reload detectors for appid cpu profiling
     if ((pkt_thread_odp_ctxt->get_version() == api.asd->get_odp_ctxt_version()) and api.asd->get_odp_ctxt().is_appid_cpu_profiler_running())
     {
-        api.asd->get_odp_ctxt().get_appid_cpu_profiler_mgr().check_appid_cpu_profiler_table_entry(api.asd, api.service.get_id(), api.client.get_id(), api.payload.get_id(), api.get_misc_app_id());
+        api.asd->get_odp_ctxt().get_appid_cpu_profiler_mgr().check_appid_cpu_profiler_table_entry(api.asd, api.get_service_app_id(), api.get_client_app_id(), api.get_payload_app_id(), api.get_misc_app_id());
     }
 
     if (!in_expected_cache)
@@ -422,7 +422,7 @@ void AppIdSession::check_tunnel_detection_restart()
 
     if (odp_ctxt.is_appid_cpu_profiler_running())
     {
-        odp_ctxt.get_appid_cpu_profiler_mgr().check_appid_cpu_profiler_table_entry(api.asd, api.service.get_id(), api.client.get_id(), api.payload.get_id(), api.get_misc_app_id());
+        odp_ctxt.get_appid_cpu_profiler_mgr().check_appid_cpu_profiler_table_entry(api.asd, api.get_service_app_id(), api.get_client_app_id(), api.get_payload_app_id(), api.get_misc_app_id());
         this->stats.processing_time = 0;
         this->stats.cpu_profiler_pkt_count = 0;
     }