]> git.ipfire.org Git - thirdparty/snort3.git/commitdiff
appid: do not clear client version when deleting appid session data
authorRon Dempster (rdempste) <rdempste@cisco.com>
Wed, 3 Aug 2022 18:08:12 +0000 (14:08 -0400)
committerRon Dempster (rdempste) <rdempste@cisco.com>
Thu, 11 Aug 2022 15:07:12 +0000 (15:07 +0000)
src/network_inspectors/appid/appid_session.cc
src/network_inspectors/appid/appid_session.h

index c58def34bbd276db0d9e689de99ff72b6ee82468..954e8dcde644c5e1c3b3a17d876f5ce9b1971d75 100644 (file)
@@ -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)
index 37472ec4ece599e8742b9b66b5742cbc20e786b4..5921348194daf15ea334ae7c4a0a13e89712be2a 100644 (file)
@@ -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;