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

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 d5dd612164fe5021d538fa5d8959c50e71ab46b6..bf5b4451d1c32262efb912b403f008aaf2bc55b1 100644 (file)
--- 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;