From: Shravan Rangarajuvenkata (shrarang) <shrarang@cisco.com>
Date: Tue, 13 Apr 2021 22:13:32 +0000 (+0000)
Subject: Merge pull request #2841 in SNORT/snort3 from ~SHRARANG/snort3:appid_dns_payload... 
X-Git-Tag: 3.1.4.0~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5bb57f5a1b14f89472d10042d7e2428a66bf20b;p=thirdparty%2Fsnort3.git

Merge pull request #2841 in SNORT/snort3 from ~SHRARANG/snort3:appid_dns_payload to master

Squashed commit of the following:

commit d3ce08a3600f610d3053c82da85bce8fafd61dda
Author: Shravan Rangaraju <shrarang@cisco.com>
Date:   Fri Apr 9 16:18:19 2021 -0400

    appid: detect payload based on dns host
---

diff --git a/src/network_inspectors/appid/service_plugins/service_discovery.cc b/src/network_inspectors/appid/service_plugins/service_discovery.cc
index b9678f047..ae28fa54d 100644
--- a/src/network_inspectors/appid/service_plugins/service_discovery.cc
+++ b/src/network_inspectors/appid/service_plugins/service_discovery.cc
@@ -703,6 +703,7 @@ bool ServiceDiscovery::do_service_discovery(AppIdSession& asd, Packet* p,
             asd.get_odp_ctxt().get_dns_matchers().scan_hostname((const uint8_t*)(dsession->get_host()),
                 dsession->get_host_len(), client_id, payload_id);
             asd.set_client_appid_data(client_id, change_bits);
+            asd.set_payload_appid_data(payload_id);
         }
         else if (asd.get_service_id() == APP_ID_RTMP)
             asd.examine_rtmp_metadata(change_bits);