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

Merge remote-tracking branch 'origin/topic/awelzel/4754-follow-up'

Browse source 
* origin/topic/awelzel/4754-follow-up:
  cluster/serializer/broker: Drop unused include
  cluster/serializer/broker: fixup inconsistent param comment
This commit is contained in:
Arne Welzel 2025-08-18 16:44:30 +02:00
commit 9b94e25e67
3 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
CHANGES
View file

@ -1,3 +1,11 @@
8.1.0-dev.81 | 2025-08-18 16:44:30 +0200
* cluster/serializer/broker: Drop unused include (Arne Welzel, Corelight)
* cluster/serializer/broker: fixup inconsistent param comment (Arne Welzel, Corelight)
References #4754 #4756
8.1.0-dev.78 | 2025-08-18 13:13:21 +0200 8.1.0-dev.78 | 2025-08-18 13:13:21 +0200
* Changed behavior of var-extraction-uri.zeek from policy/protocol/http to extract only the URI parameter names. Do not include the path in the first parameter name. Only extract uri vars if parameters actually exist. (Benjamin Grap) * Changed behavior of var-extraction-uri.zeek from policy/protocol/http to extract only the URI parameter names. Do not include the path in the first parameter name. Only extract uri vars if parameters actually exist. (Benjamin Grap)

2
VERSION
View file

@ -1 +1 @@
8.1.0-dev.78 8.1.0-dev.81

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

@ -14,7 +14,6 @@
#include "zeek/broker/Data.h" #include "zeek/broker/Data.h"
#include "zeek/cluster/Event.h" #include "zeek/cluster/Event.h"
#include "broker/data.bif.h"
#include "broker/data_envelope.hh" #include "broker/data_envelope.hh"
#include "broker/error.hh" #include "broker/error.hh"
#include "broker/format/json.hh" #include "broker/format/json.hh"
@ -59,7 +58,7 @@ std::optional<broker::zeek::Event> detail::to_broker_event(const zeek::cluster::
xs.reserve(ev.Args().size()); xs.reserve(ev.Args().size());
for ( const auto& a : ev.Args() ) { for ( const auto& a : ev.Args() ) {
if ( auto res = zeek::Broker::detail::val_to_data(a.get(), /*flatten_broker_dataval=*/true) ) if ( auto res = zeek::Broker::detail::val_to_data(a.get(), /*unwrap_broker_data=*/true) )
xs.emplace_back(std::move(res.value())); xs.emplace_back(std::move(res.value()));
else else
return std::nullopt; return std::nullopt;