From: Shravan Rangarajuvenkata (shrarang) <shrarang@cisco.com>
Date: Tue, 6 Apr 2021 17:24:38 +0000 (+0000)
Subject: Merge pull request #2827 in SNORT/snort3 from ~SATHIRKA/snort3:reload_tp_core to... 
X-Git-Tag: 3.1.4.0~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62fe32cb6f16888facf18c9d08fdb49e6edb6f6d;p=thirdparty%2Fsnort3.git

Merge pull request #2827 in SNORT/snort3 from ~SATHIRKA/snort3:reload_tp_core to master

Squashed commit of the following:

commit c6e4f9fbc002d75c9b352193993f967281271066
Author: Sreeja Athirkandathil Narayanan <sathirka@cisco.com>
Date:   Thu Apr 1 17:45:12 2021 -0400

    appid: Delete third-party connections with context only if third-party reload is not in progress
---

diff --git a/src/network_inspectors/appid/appid_session.cc b/src/network_inspectors/appid/appid_session.cc
index d5dd61216..bf5b4451d 100644
--- a/src/network_inspectors/appid/appid_session.cc
+++ b/src/network_inspectors/appid/appid_session.cc
@@ -134,7 +134,8 @@ AppIdSession::~AppIdSession()
     if (tpsession)
     {
         if (pkt_thread_tp_appid_ctxt and
-            (tpsession->get_ctxt_version() == pkt_thread_tp_appid_ctxt->get_version()))
+            ((tpsession->get_ctxt_version() == pkt_thread_tp_appid_ctxt->get_version()) and
+            !ThirdPartyAppIdContext::get_tp_reload_in_progress()))
             tpsession->delete_with_ctxt();
         else
             delete tpsession;