Merge pull request #2703 in SNORT/snort3 from ~SHRARANG/snort3:appid_sip_reload to...

Squashed commit of the following:

commit 14adfff5e37a683b77cc1426edf78c37bdbc2897
Author: Shravan Rangaraju <shrarang@cisco.com>
Date:   Fri Jan 15 00:03:42 2021 -0500

    appid: do not process sip event for an existing session after detector reload

diff --git a/src/network_inspectors/appid/detector_plugins/detector_sip.cc b/src/network_inspectors/appid/detector_plugins/detector_sip.cc
index 13c06e1487a98c4c7b827007c7fd45e0f257cdc8..bb96532f242dd89c1cf44a3a513811fba6efc287 100644 (file)
--- a/src/network_inspectors/appid/detector_plugins/detector_sip.cc
+++ b/src/network_inspectors/appid/detector_plugins/detector_sip.cc
@@ -318,9 +318,13 @@ void SipEventHandler::handle(DataEvent& event, Flow* flow)
     if (!flow)
         return;
 
-    SipEvent& sip_event = (SipEvent&)event;
     AppIdSession* asd = appid_api.get_appid_session(*flow);
+    // Skip for sessions using old odp context after odp reload
+    if (asd and (!pkt_thread_odp_ctxt or
+        (asd->get_odp_ctxt_version() != pkt_thread_odp_ctxt->get_version())))
+        return;
 
+    SipEvent& sip_event = (SipEvent&)event;
     const Packet* p = sip_event.get_packet();
     assert(p);
     if ( !asd )