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

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 f008f96b0d0183b8519f300fa10f75e6c382571c..67c50769281ee5ef32a28762ee1e9f22aa00f8b7 100644 (file)
--- 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)