diff --git a/CHANGES b/CHANGES index ac10b8ca7a..fc6c1d23ad 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +4.1.0-dev.859 | 2021-07-02 10:16:25 -0700 + + * Update Broker submodule (Dominik Charousset, Corelight) + 4.1.0-dev.856 | 2021-07-02 13:01:05 +0100 * Update Mozilla CA list and CT anchors. (Johanna Amann, Corelight) diff --git a/VERSION b/VERSION index 66bcb70e55..a45d304733 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.1.0-dev.856 +4.1.0-dev.859 diff --git a/auxil/broker b/auxil/broker index 2ea1df2d50..ac0faa99f2 160000 --- a/auxil/broker +++ b/auxil/broker @@ -1 +1 @@ -Subproject commit 2ea1df2d5067c218263a4dfec2952997246d6666 +Subproject commit ac0faa99f22a91310683d51f9c7b484ba874a309 diff --git a/src/broker/Manager.cc b/src/broker/Manager.cc index 29e38795ca..e61f8b6421 100644 --- a/src/broker/Manager.cc +++ b/src/broker/Manager.cc @@ -139,8 +139,8 @@ class BrokerState { public: BrokerState(BrokerConfig config, size_t congestion_queue_size) : endpoint(std::move(config)), - subscriber(endpoint.make_subscriber({broker::topics::statuses, - broker::topics::errors}, + subscriber(endpoint.make_subscriber({broker::topic::statuses(), + broker::topic::errors()}, congestion_queue_size)) { } @@ -382,7 +382,7 @@ void Manager::InitPostScript() if ( ! iosource_mgr->RegisterFd(bstate->subscriber.fd(), this) ) reporter->FatalError("Failed to register broker subscriber with iosource_mgr"); - bstate->subscriber.add_topic(broker::topics::store_events, true); + bstate->subscriber.add_topic(broker::topic::store_events(), true); InitializeBrokerStoreForwarding(); } @@ -1094,7 +1094,7 @@ void Manager::Process() { auto& topic = broker::get_topic(message); - if ( broker::topics::statuses.prefix_of(topic) ) + if ( broker::is_prefix(topic, broker::topic::statuses_str) ) { if ( auto stat = broker::make_status_view(get_data(message)) ) { @@ -1109,7 +1109,7 @@ void Manager::Process() continue; } - if ( broker::topics::errors.prefix_of(topic) ) + if ( broker::is_prefix(topic, broker::topic::errors_str) ) { if ( auto err = broker::make_error_view(get_data(message)) ) { @@ -1124,7 +1124,7 @@ void Manager::Process() continue; } - if ( broker::topics::store_events.prefix_of(topic) ) + if ( broker::is_prefix(topic, broker::topic::store_events_str) ) { ProcessStoreEvent(broker::move_data(message)); continue;