Merge pull request #2490 in SNORT/snort3 from ~SATHIRKA/snort3:tp_reload_prune to...

Squashed commit of the following:

commit b0b8a306141597733b5361c88650c1f6bdb4fde9
Author: Sreeja Athirkandathil Narayanan <sathirka@cisco.com>
Date:   Mon Sep 14 09:35:36 2020 -0400

    appid: Check third party context version while deleting connections

diff --git a/src/network_inspectors/appid/appid_session.cc b/src/network_inspectors/appid/appid_session.cc
index dad1981181e56fbd51cc48ad1e750884021faf2a..699da59de3d05070fb03a80648d9cbe4686e64da 100644 (file)
--- a/src/network_inspectors/appid/appid_session.cc
+++ b/src/network_inspectors/appid/appid_session.cc
@@ -133,7 +133,8 @@ AppIdSession::~AppIdSession()
 
     if (tpsession)
     {
-        if (&(tpsession->get_ctxt()) == pkt_thread_tp_appid_ctxt)
+        if (pkt_thread_tp_appid_ctxt and
+            (tpsession->get_ctxt_version() == pkt_thread_tp_appid_ctxt->get_version()))
             tpsession->delete_with_ctxt();
         else
             delete tpsession;

diff --git a/src/network_inspectors/appid/test/tp_mock.cc b/src/network_inspectors/appid/test/tp_mock.cc
index ad50397faed9cb60fee875f8824fd51af2ab2b9f..ba8641d9138f14b096b1fcd4523b7213dd24b554 100644 (file)
--- a/src/network_inspectors/appid/test/tp_mock.cc
+++ b/src/network_inspectors/appid/test/tp_mock.cc
@@ -65,7 +65,7 @@ public:
     ThirdPartyAppIdSessionImpl(ThirdPartyAppIdContext& ctxt)
       : ThirdPartyAppIdSession(ctxt)
     { }
-    bool reset() override { return 1; }
+    void reset() override { }
     void delete_with_ctxt() override { delete this; }
     TPState process(const Packet&, AppidSessionDirection, vector<AppId>&,
         ThirdPartyAppIDAttributeData&) override { return TP_STATE_INIT; }

diff --git a/src/network_inspectors/appid/tp_appid_module_api.h b/src/network_inspectors/appid/tp_appid_module_api.h
index 95760aa18547e78a6beefbf2099eac3ee74eb8d2..b34bb8ca8215ea13f14ebdbc89cd448018119ace 100644 (file)
--- a/src/network_inspectors/appid/tp_appid_module_api.h
+++ b/src/network_inspectors/appid/tp_appid_module_api.h
@@ -26,7 +26,7 @@
 #include "main/thread.h"
 #include "tp_appid_types.h"
 
-#define THIRD_PARTY_APPID_API_VERSION 5
+#define THIRD_PARTY_APPID_API_VERSION 6
 
 class ThirdPartyConfig
 {

diff --git a/src/network_inspectors/appid/tp_appid_session_api.h b/src/network_inspectors/appid/tp_appid_session_api.h
index d1e11bd2f36742aaa86071661155539ce234a9a6..5247ea09ae22ce1385436baaa7d8d14a25f679a2 100644 (file)
--- a/src/network_inspectors/appid/tp_appid_session_api.h
+++ b/src/network_inspectors/appid/tp_appid_session_api.h
@@ -44,7 +44,7 @@ public:
     }
     virtual ~ThirdPartyAppIdSession() { }
 
-    virtual bool reset() = 0;            // just reset state
+    virtual void reset() = 0;            // just reset state
     virtual void delete_with_ctxt() = 0;
     virtual TPState process(const snort::Packet&,
         AppidSessionDirection direction,