From: Ron Dempster (rdempste) <rdempste@cisco.com>
Date: Wed, 3 Aug 2022 18:08:12 +0000 (-0400)
Subject: appid: do not clear client version when deleting appid session data
X-Git-Tag: 3.1.40.0~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2851e5b3764261798a48b7bc816541bfa856659e;p=thirdparty%2Fsnort3.git

appid: do not clear client version when deleting appid session data
---

diff --git a/src/network_inspectors/appid/appid_session.cc b/src/network_inspectors/appid/appid_session.cc
index c58def34b..954e8dcde 100644
--- a/src/network_inspectors/appid/appid_session.cc
+++ b/src/network_inspectors/appid/appid_session.cc
@@ -171,7 +171,7 @@ AppIdSession::~AppIdSession()
             delete tpsession;
     }
 
-    delete_session_data(false);
+    delete tsession;
     free_flow_data();
     service_candidates.clear();
     client_candidates.clear();
@@ -672,18 +672,13 @@ bool AppIdSession::is_svc_taking_too_much_time() const
         init_bytes_without_reply > odp_ctxt.max_bytes_before_service_fail));
 }
 
-void AppIdSession::delete_session_data(bool free_api)
+void AppIdSession::delete_session_data()
 {
     api.service.reset();
     api.client.reset();
     api.payload.reset();
-
-    if (tsession)
-        delete tsession;
-
-    // delete api data only when appid session is getting reset
-    if (free_api)
-        api.delete_session_data();
+    api.delete_session_data();
+    delete tsession;
 }
 
 int AppIdSession::add_flow_data(void* data, unsigned id, AppIdFreeFCN fcn)
diff --git a/src/network_inspectors/appid/appid_session.h b/src/network_inspectors/appid/appid_session.h
index 37472ec4e..592134819 100644
--- a/src/network_inspectors/appid/appid_session.h
+++ b/src/network_inspectors/appid/appid_session.h
@@ -666,7 +666,7 @@ private:
     uint16_t prev_http2_raw_packet = 0;
 
     void reinit_session_data(AppidChangeBits& change_bits, ThirdPartyAppIdContext* tp_appid_ctxt);
-    void delete_session_data(bool free_api = true);
+    void delete_session_data();
 
     bool tp_app_id_deferred = false;
     bool tp_payload_app_id_deferred = false;