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

Event: Move meta after args

Browse source
This commit is contained in:
Arne Welzel 2025-05-23 16:16:11 +02:00
parent 89402fcc1b
commit bfcb68f8e7
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Event.cc
View file

@ -44,21 +44,21 @@ Event::Event(const EventHandlerPtr& arg_handler, zeek::Args arg_args, util::deta
analyzer::ID arg_aid, Obj* arg_obj, double arg_ts) analyzer::ID arg_aid, Obj* arg_obj, double arg_ts)
: handler(arg_handler), : handler(arg_handler),
args(std::move(arg_args)), args(std::move(arg_args)),
meta(detail::MakeEventMetadataVector(arg_ts)),
src(arg_src), src(arg_src),
aid(arg_aid), aid(arg_aid),
obj(zeek::NewRef{}, arg_obj), obj(zeek::NewRef{}, arg_obj),
next_event(nullptr), next_event(nullptr) {}
meta(detail::MakeEventMetadataVector(arg_ts)) {}
Event::Event(detail::EventMetadataVectorPtr arg_meta, const EventHandlerPtr& arg_handler, zeek::Args arg_args, Event::Event(detail::EventMetadataVectorPtr arg_meta, const EventHandlerPtr& arg_handler, zeek::Args arg_args,
util::detail::SourceID arg_src, analyzer::ID arg_aid, Obj* arg_obj) util::detail::SourceID arg_src, analyzer::ID arg_aid, Obj* arg_obj)
: handler(arg_handler), : handler(arg_handler),
args(std::move(arg_args)), args(std::move(arg_args)),
meta(std::move(arg_meta)),
src(arg_src), src(arg_src),
aid(arg_aid), aid(arg_aid),
obj(zeek::NewRef{}, arg_obj), obj(zeek::NewRef{}, arg_obj),
next_event(nullptr), next_event(nullptr) {}
meta(std::move(arg_meta)) {}
zeek::VectorValPtr Event::MetadataValues(const EnumValPtr& id) const { zeek::VectorValPtr Event::MetadataValues(const EnumValPtr& id) const {
static const auto& any_vec_t = zeek::id::find_type<zeek::VectorType>("any_vec"); static const auto& any_vec_t = zeek::id::find_type<zeek::VectorType>("any_vec");

2
src/Event.h
View file

@ -93,11 +93,11 @@ private:
EventHandlerPtr handler; EventHandlerPtr handler;
zeek::Args args; zeek::Args args;
detail::EventMetadataVectorPtr meta;
util::detail::SourceID src; util::detail::SourceID src;
analyzer::ID aid; analyzer::ID aid;
zeek::IntrusivePtr<Obj> obj; zeek::IntrusivePtr<Obj> obj;
Event* next_event; Event* next_event;
detail::EventMetadataVectorPtr meta;
}; };
class EventMgr final : public Obj, public iosource::IOSource { class EventMgr final : public Obj, public iosource::IOSource {