]> git.ipfire.org Git - thirdparty/snort3.git/commitdiff
Pull request #5189: appid: sync host attributes on http event service detection
authorBohdan Hryniv -X (bhryniv - SOFTSERVE INC at Cisco) <bhryniv@cisco.com>
Tue, 17 Mar 2026 17:37:20 +0000 (17:37 +0000)
committerChris Sherwin (chsherwi) <chsherwi@cisco.com>
Tue, 17 Mar 2026 17:37:20 +0000 (17:37 +0000)
Merge in SNORT/snort3 from ~BHRYNIV/snort3:fix_host_attr_update to master

Squashed commit of the following:

commit e6023378ba51b7f62cb24e8ecf400429ce2d8037
Author: Bohdan Hryniv <bhryniv@cisco>
Date:   Thu Mar 5 06:25:38 2026 -0500

    appid: sync host attributes on http event service detection

src/network_inspectors/appid/appid_http_event_handler.cc
src/network_inspectors/appid/test/appid_http_event_test.cc

index 5da34f5c63fbb71304c005fb934c816a4bf0733c..1d0b7cfe233e1704fe868dab2d512bed1d23b429 100644 (file)
@@ -198,6 +198,9 @@ void HttpEventHandler::handle(DataEvent& event, Flow* flow)
     else
         asd->set_application_ids_service(asd->get_service_id(), change_bits);
 
+    if (change_bits.test(APPID_SERVICE_BIT))
+        asd->sync_with_snort_protocol_id(asd->pick_service_app_id(), p, change_bits);
+
     asd->publish_appid_event(change_bits, *p, http_event->get_is_httpx(),
         asd->get_api().get_hsessions_size() - 1);
 
index b1bc8b70e4d1555d13b5073db610600063080cf2..6468d23c9e03fe2c888f733a6d469732c4400b66 100644 (file)
@@ -97,6 +97,7 @@ AppIdSession* AppIdSession::allocate_session(const Packet*, IpProtocol, AppidSes
 void AppIdModule::reset_stats() {}
 void AppIdSession::set_application_ids_service(AppId, AppidChangeBits&) {}
 void AppIdSession::set_ss_application_ids(AppId, AppId, AppId, AppId, AppId, AppidChangeBits&) {}
+void AppIdSession::sync_with_snort_protocol_id(AppId, Packet*, AppidChangeBits&) {}
 AppIdHttpSession* AppIdSession::get_http_session(uint32_t stream_index) const
 {
     if (stream_index < api.hsessions.size())