From: Shravan Rangarajuvenkata (shrarang) <shrarang@cisco.com>
Date: Fri, 16 Oct 2020 19:44:41 +0000 (+0000)
Subject: Merge pull request #2550 in SNORT/snort3 from ~SATHIRKA/snort3:continue_inspection_af... 
X-Git-Tag: 3.0.3-3~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60f494fbef682b1b89f8dae101dbe104647f1a05;p=thirdparty%2Fsnort3.git

Merge pull request #2550 in SNORT/snort3 from ~SATHIRKA/snort3:continue_inspection_after_tp to master

Squashed commit of the following:

commit de757ccedcdc38e0b9f718bf62f64c5814abe5bc
Author: Sreeja Athirkandathil Narayanan <sathirka@cisco.com>
Date:   Wed Oct 14 14:54:00 2020 -0400

    appid: Continue appid inspection after third-party identifies an application
---

diff --git a/src/network_inspectors/appid/client_plugins/client_discovery.cc b/src/network_inspectors/appid/client_plugins/client_discovery.cc
index 43b447215..9a685115c 100644
--- a/src/network_inspectors/appid/client_plugins/client_discovery.cc
+++ b/src/network_inspectors/appid/client_plugins/client_discovery.cc
@@ -348,9 +348,9 @@ bool ClientDiscovery::do_client_discovery(AppIdSession& asd, Packet* p,
          asd.is_tp_appid_available() )
     {
         entry = asd.get_odp_ctxt().get_app_info_mgr().get_app_info_entry(tp_app_id);
-        if ( !( entry && entry->client_detector
-            && entry->client_detector == asd.client_detector
-            && (entry->flags & (APPINFO_FLAG_CLIENT_ADDITIONAL | APPINFO_FLAG_CLIENT_USER) ) ) )
+        if (!entry or !entry->client_detector
+            or !(entry->flags & (APPINFO_FLAG_CLIENT_ADDITIONAL | APPINFO_FLAG_CLIENT_USER))
+            or (asd.client_detector and (entry->client_detector != asd.client_detector)))
         {
             asd.client_disco_state = APPID_DISCO_STATE_FINISHED;
             asd.set_client_detected();