Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/neverlord/broker-fix'

Browse source 
* origin/topic/neverlord/broker-fix:
  Update Broker submodule
This commit is contained in:
Tim Wojtulewicz 2021-07-02 10:16:25 -07:00
commit 7dd18ec906
4 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -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 4.1.0-dev.856 | 2021-07-02 13:01:05 +0100
* Update Mozilla CA list and CT anchors. (Johanna Amann, Corelight) * Update Mozilla CA list and CT anchors. (Johanna Amann, Corelight)

2
VERSION
View file

@ -1 +1 @@
4.1.0-dev.856 4.1.0-dev.859

2
auxil/broker

@ -1 +1 @@
Subproject commit 2ea1df2d5067c218263a4dfec2952997246d6666 Subproject commit ac0faa99f22a91310683d51f9c7b484ba874a309

12
src/broker/Manager.cc
View file

@ -139,8 +139,8 @@ class BrokerState {
public: public:
BrokerState(BrokerConfig config, size_t congestion_queue_size) BrokerState(BrokerConfig config, size_t congestion_queue_size)
: endpoint(std::move(config)), : endpoint(std::move(config)),
subscriber(endpoint.make_subscriber({broker::topics::statuses, subscriber(endpoint.make_subscriber({broker::topic::statuses(),
broker::topics::errors}, broker::topic::errors()},
congestion_queue_size)) congestion_queue_size))
{ {
} }
@ -382,7 +382,7 @@ void Manager::InitPostScript()
if ( ! iosource_mgr->RegisterFd(bstate->subscriber.fd(), this) ) if ( ! iosource_mgr->RegisterFd(bstate->subscriber.fd(), this) )
reporter->FatalError("Failed to register broker subscriber with iosource_mgr"); 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(); InitializeBrokerStoreForwarding();
} }
@ -1094,7 +1094,7 @@ void Manager::Process()
{ {
auto& topic = broker::get_topic(message); 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)) ) if ( auto stat = broker::make_status_view(get_data(message)) )
{ {
@ -1109,7 +1109,7 @@ void Manager::Process()
continue; 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)) ) if ( auto err = broker::make_error_view(get_data(message)) )
{ {
@ -1124,7 +1124,7 @@ void Manager::Process()
continue; continue;
} }
if ( broker::topics::store_events.prefix_of(topic) ) if ( broker::is_prefix(topic, broker::topic::store_events_str) )
{ {
ProcessStoreEvent(broker::move_data(message)); ProcessStoreEvent(broker::move_data(message));
continue; continue;