]> git.ipfire.org Git - thirdparty/snort3.git/commitdiff
Pull request #3952: appid: mark ssl appid lookup successful if a service id is available
authorSreeja Athirkandathil Narayanan (sathirka) <sathirka@cisco.com>
Tue, 22 Aug 2023 18:52:25 +0000 (18:52 +0000)
committerChris Sherwin (chsherwi) <chsherwi@cisco.com>
Tue, 22 Aug 2023 18:52:25 +0000 (18:52 +0000)
Merge in SNORT/snort3 from ~SATHIRKA/snort3:ssl_api_fix to master

Squashed commit of the following:

commit b70cfde78e3439c33f7d11225b9986e10b57f276
Author: Sreeja Athirkandathil Narayanan <sathirka@cisco.com>
Date:   Tue Aug 8 14:41:52 2023 -0400

    appid: mark ssl appid lookup successful if a service id is available

src/network_inspectors/appid/appid_api.cc

index 67bb7b226d6b2ec41649fb6548f8c65182f11cb1..f8d8ddaf5208eb28fd05ca43065cefefae77a9d4 100644 (file)
@@ -232,7 +232,7 @@ bool AppIdApi::ssl_app_group_id_lookup(Flow* flow, const char* server_name,
                 payload_id);
     }
 
-    if (client_id != APP_ID_NONE or payload_id != APP_ID_NONE)
+    if (service_id != APP_ID_NONE or client_id != APP_ID_NONE or payload_id != APP_ID_NONE)
     {
         return true;
     }