]> git.ipfire.org Git - thirdparty/snort3.git/commitdiff
Pull request #3672: appid: Make appid availability independent from TP state
authorSreeja Athirkandathil Narayanan (sathirka) <sathirka@cisco.com>
Wed, 23 Nov 2022 17:50:51 +0000 (17:50 +0000)
committerSreeja Athirkandathil Narayanan (sathirka) <sathirka@cisco.com>
Wed, 23 Nov 2022 17:50:51 +0000 (17:50 +0000)
Merge in SNORT/snort3 from ~OSTEPANO/snort3:appid_availability_without_navl to master

Squashed commit of the following:

commit 4649cdf312728e5d7b60648b9f154da43a268adf
Author: Oleksandr Stepanov <ostepano@cisco.com>
Date:   Thu Nov 17 08:09:36 2022 -0500

    appid: Make appid availability independent from TP state

src/network_inspectors/appid/appid_session_api.cc

index 3f0b65825a0f89f64baa81634d8c9266f3766a7e..8e609b9951471e972c6d6c734f7ffcb42233e63c 100644 (file)
@@ -252,10 +252,8 @@ bool AppIdSessionApi::is_appid_available(uint32_t stream_index) const
     if (service.get_id() == APP_ID_HTTP2 or service.get_id() == APP_ID_HTTP3)
         return (get_payload_app_id(stream_index) != APP_ID_NONE);
     else
-        return ( (service.get_id() != APP_ID_NONE or
-            payload.get_id() != APP_ID_NONE) and
-            (asd->is_tp_appid_available() or
-            asd->get_session_flags(APPID_SESSION_NO_TPI)) );
+        return (service.get_id() != APP_ID_NONE or
+            payload.get_id() != APP_ID_NONE);
 }
 
 const char* AppIdSessionApi::get_client_info(uint32_t stream_index) const