From: Shravan Rangarajuvenkata (shrarang) <shrarang@cisco.com>
Date: Thu, 23 Apr 2020 02:02:56 +0000 (+0000)
Subject: Merge pull request #2177 in SNORT/snort3 from ~KAMURTHI/snort3:http2-tp-processing... 
X-Git-Tag: 3.0.1-2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16a2411cbca48d26357d9c592c656ae2fb69b0f3;p=thirdparty%2Fsnort3.git

Merge pull request #2177 in SNORT/snort3 from ~KAMURTHI/snort3:http2-tp-processing to master

Squashed commit of the following:

commit 94fa65fd1b7138aae115e72945de1b3623bc7665
Author: Kanimozhi Murthi <kamurthi@cisco.com>
Date:   Wed Apr 22 09:34:51 2020 -0400

    appid: remove thirdparty processing for http2 traffic
---

diff --git a/src/network_inspectors/appid/appid_discovery.cc b/src/network_inspectors/appid/appid_discovery.cc
index f008f96b0..67c507692 100644
--- a/src/network_inspectors/appid/appid_discovery.cc
+++ b/src/network_inspectors/appid/appid_discovery.cc
@@ -820,7 +820,7 @@ bool AppIdDiscovery::do_discovery(Packet* p, AppIdSession& asd, IpProtocol proto
     }
 
     // Third party detection
-    if (tp_appid_ctxt)
+    if (tp_appid_ctxt && !asd.is_http2)
     {
         // Skip third-party inspection for sessions using old config
         if (asd.tpsession and &(asd.tpsession->get_ctxt()) != tp_appid_ctxt)