Merge pull request #3092 in SNORT/snort3 from ~SHRARANG/snort3:appid_user_agent_confl...

Squashed commit of the following:

commit 20f74e289a32707dfe605235ed6fa72c2f0c6c0f
Author: Shravan Rangaraju <shrarang@cisco.com>
Date:   Wed Oct 6 09:20:42 2021 -0400

    appid: detect client based on longest matching user agent pattern

diff --git a/src/network_inspectors/appid/detector_plugins/http_url_patterns.cc b/src/network_inspectors/appid/detector_plugins/http_url_patterns.cc
index 8a9d387b52ba4db80fcee3be5298d7186318a1f5..caf00e59b3c9b91ccfcb4eabe369f8071dd48622 100644 (file)
--- a/src/network_inspectors/appid/detector_plugins/http_url_patterns.cc
+++ b/src/network_inspectors/appid/detector_plugins/http_url_patterns.cc
@@ -1230,12 +1230,12 @@ void HttpPatternMatchers::identify_user_agent(const char* start, int size, AppId
             default:
                 if (match->client_id)
                 {
+                    if (match->pattern_size <= longest_misc_match)
+                        break;
                     dominant_pattern_detected = 1;
                     service_id = APP_ID_HTTP;
                     client_id = match->client_id;
 
-                    if (match->pattern_size <= longest_misc_match)
-                        break;
                     longest_misc_match = match->pattern_size;
                     i = 0;
                     /* if we already collected temp_ver information after seeing 'Version', let's