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

cluster/serializer/broker: Do not special case Broker::Data anymore

Browse source 
The previous approach ignored the fact that nested / inner values might
also be Broker::Data values. I'm not super sure about the validity of
the test, because it's essentially demonstrating any-nesting, but
it's not leading to extra Broker::Data encoding.
This commit is contained in:
Arne Welzel 2025-08-15 21:33:52 +02:00
parent 9e70d8b8ad
commit f57a1263d4
4 changed files with 24 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/cluster/serializer/broker/Serializer.cc
View file

@ -59,19 +59,10 @@ std::optional<broker::zeek::Event> detail::to_broker_event(const zeek::cluster::
xs.reserve(ev.Args().size());
for ( const auto& a : ev.Args() ) {
if ( a->GetType() == zeek::BifType::Record::Broker::Data ) {
// When encountering a Broker::Data instance within args, pick out
// the broker::data directly to avoid double encoding, Broker::Data.
const auto& val = a->AsRecordVal()->GetField(0);
auto* data_val = static_cast<zeek::Broker::detail::DataVal*>(val.get());
xs.emplace_back(data_val->data);
}
else if ( auto res = zeek::Broker::detail::val_to_data(a.get()) ) {
if ( auto res = zeek::Broker::detail::val_to_data(a.get(), /*flatten_broker_dataval=*/true) )
xs.emplace_back(std::move(res.value()));
}
else {
else
return std::nullopt;
}
}
// Convert metadata from the cluster::detail::Event event to broker's event metadata format.