Merge pull request #3100 in SNORT/snort3 from ~SMINUT/snort3:hosts_lua to master

Squashed commit of the following:

commit 1a4a55d21c0f95ac0e128c5654490719acdfdef2
Author: Silviu Minut <sminut@cisco.com>
Date:   Mon Oct 11 18:21:09 2021 -0400

    rna: do not do service discovery for future flows

diff --git a/src/network_inspectors/rna/rna_app_discovery.cc b/src/network_inspectors/rna/rna_app_discovery.cc
index 3b0cf191deeb4df261d7acc16976b3130e7de9c2..e810ff6d86c3a8589086589fce92e9b332a7eb73 100644 (file)
--- a/src/network_inspectors/rna/rna_app_discovery.cc
+++ b/src/network_inspectors/rna/rna_app_discovery.cc
@@ -77,8 +77,9 @@ void RnaAppDiscovery::process(AppidEvent* appid_event, DiscoveryFilter& filter,
     {
         AppId client, payload;
         appid_session_api.get_app_id(nullptr, &client, &payload, nullptr, nullptr);
+        bool is_future_flow = appid_session_api.get_appid_session_attribute(APPID_SESSION_FUTURE_FLOW);
 
-        if ( appid_change_bits[APPID_SERVICE_BIT] and service > APP_ID_NONE )
+        if ( appid_change_bits[APPID_SERVICE_BIT] and service > APP_ID_NONE and !is_future_flow)
         {
             if ( service == APP_ID_DHCP )
             {