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

broker: Handle Broker::publish() with non Broker::Event

Browse source 
Closes #4571
This commit is contained in:
Arne Welzel 2025-06-20 17:10:10 +02:00
parent a22837536d
commit 07e9870f34
4 changed files with 69 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/broker/messaging.bif
View file

@ -66,15 +66,22 @@ static bool publish_event_args(ArgsSpan args, const zeek::String* topic,
"Did you mean to use Cluster::publish() instead of Broker::publish()?");
if ( args[0]->GetType()->Tag() == zeek::TYPE_RECORD )
rval = zeek::broker_mgr->PublishEvent(topic->CheckString(),
args[0]->AsRecordVal());
else
{
auto ev = zeek::broker_mgr->MakeEvent(args, frame);
rval = zeek::broker_mgr->PublishEvent(topic->CheckString(), ev->AsRecordVal());
auto* rv = args[0]->AsRecordVal();
// same_type() should be fast if it's the type pointers are the same.
if ( ! zeek::same_type(rv->GetType(), zeek::BifType::Record::Broker::Event) )
{
zeek::emit_builtin_error(zeek::util::fmt("expected Broker::Event, got %s",
zeek::obj_desc_short(rv->GetType()).c_str()));
return false;
}
return zeek::broker_mgr->PublishEvent(topic->CheckString(), rv);
}
return rval;
auto ev = zeek::broker_mgr->MakeEvent(args, frame);
return zeek::broker_mgr->PublishEvent(topic->CheckString(), ev->AsRecordVal());
}
static bool is_cluster_pool(zeek::Val* pool)