mirror of
https://github.com/zeek/zeek.git
synced 2025-10-02 06:38:20 +00:00

Allow users to call event_mgr.Dispatch(handler, args) instead of constructing the Event instance themselves. Deprecate the old API and replace users. There's a subtle change that net_done() may be propagated via auto_publish() now, but that still needs opt-in from script land and likely no one did that, or else they'd expected to have it work anyhow.
187 lines
4.8 KiB
C++
187 lines
4.8 KiB
C++
// See the file "COPYING" in the main distribution directory for copyright.
|
|
|
|
#include "zeek/Event.h"
|
|
|
|
#include "zeek/Desc.h"
|
|
#include "zeek/Trigger.h"
|
|
#include "zeek/Val.h"
|
|
#include "zeek/iosource/Manager.h"
|
|
#include "zeek/plugin/Manager.h"
|
|
|
|
#include "event.bif.netvar_h"
|
|
|
|
zeek::EventMgr zeek::event_mgr;
|
|
|
|
namespace zeek {
|
|
|
|
Event::Event(const EventHandlerPtr& arg_handler, zeek::Args arg_args, util::detail::SourceID arg_src,
|
|
analyzer::ID arg_aid, Obj* arg_obj, double arg_ts)
|
|
: handler(arg_handler),
|
|
args(std::move(arg_args)),
|
|
src(arg_src),
|
|
aid(arg_aid),
|
|
ts(arg_ts),
|
|
obj(arg_obj),
|
|
next_event(nullptr) {
|
|
if ( obj )
|
|
Ref(obj);
|
|
}
|
|
|
|
void Event::Describe(ODesc* d) const {
|
|
if ( d->IsReadable() )
|
|
d->AddSP("event");
|
|
|
|
bool s = d->IsShort();
|
|
d->SetShort(s);
|
|
|
|
if ( ! d->IsBinary() )
|
|
d->Add("(");
|
|
describe_vals(args, d);
|
|
if ( ! d->IsBinary() )
|
|
d->Add("(");
|
|
}
|
|
|
|
void Event::Dispatch(bool no_remote) {
|
|
if ( src == util::detail::SOURCE_BROKER )
|
|
no_remote = true;
|
|
|
|
if ( handler->ErrorHandler() )
|
|
reporter->BeginErrorHandler();
|
|
|
|
try {
|
|
#pragma GCC diagnostic push
|
|
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
|
// Replace in v8.1 with handler->Call(&args).
|
|
handler->Call(&args, no_remote, ts);
|
|
#pragma GCC diagnostic pop
|
|
}
|
|
|
|
catch ( InterpreterException& e ) {
|
|
// Already reported.
|
|
}
|
|
|
|
if ( obj )
|
|
// obj->EventDone();
|
|
Unref(obj);
|
|
|
|
if ( handler->ErrorHandler() )
|
|
reporter->EndErrorHandler();
|
|
}
|
|
|
|
EventMgr::~EventMgr() {
|
|
while ( head ) {
|
|
Event* n = head->NextEvent();
|
|
Unref(head);
|
|
head = n;
|
|
}
|
|
}
|
|
|
|
void EventMgr::Enqueue(const EventHandlerPtr& h, Args vl, util::detail::SourceID src, analyzer::ID aid, Obj* obj,
|
|
double ts) {
|
|
QueueEvent(new Event(h, std::move(vl), src, aid, obj, ts));
|
|
}
|
|
|
|
void EventMgr::QueueEvent(Event* event) {
|
|
bool done = PLUGIN_HOOK_WITH_RESULT(HOOK_QUEUE_EVENT, HookQueueEvent(event), false);
|
|
|
|
if ( done )
|
|
return;
|
|
|
|
if ( ! head ) {
|
|
head = tail = event;
|
|
}
|
|
else {
|
|
tail->SetNext(event);
|
|
tail = event;
|
|
}
|
|
|
|
++event_mgr.num_events_queued;
|
|
}
|
|
|
|
void EventMgr::Dispatch(Event* event, bool no_remote) {
|
|
Event* old_current = current;
|
|
current = event;
|
|
event->Dispatch(no_remote);
|
|
current = old_current;
|
|
Unref(event);
|
|
}
|
|
|
|
void EventMgr::Dispatch(const EventHandlerPtr& h, zeek::Args vl) {
|
|
auto* ev = new Event(h, std::move(vl));
|
|
|
|
// Technically this isn't queued, but still give plugins a chance to
|
|
// intercept the event and cancel or modify it if really wanted.
|
|
bool done = PLUGIN_HOOK_WITH_RESULT(HOOK_QUEUE_EVENT, HookQueueEvent(ev), false);
|
|
if ( done )
|
|
return;
|
|
|
|
#pragma GCC diagnostic push
|
|
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
|
// TODO: Open-code the old Dispatch() implementation here in v8.1.
|
|
Dispatch(ev);
|
|
#pragma GCC diagnostic pop
|
|
}
|
|
|
|
void EventMgr::Drain() {
|
|
if ( event_queue_flush_point )
|
|
Enqueue(event_queue_flush_point, Args{});
|
|
|
|
PLUGIN_HOOK_VOID(HOOK_DRAIN_EVENTS, HookDrainEvents());
|
|
|
|
// Past Zeek versions drained as long as there events, including when
|
|
// a handler queued new events during its execution. This could lead
|
|
// to endless loops in case a handler kept triggering its own event.
|
|
// We now limit this to just a couple of rounds. We do more than
|
|
// just one round to make it less likely to break existing scripts
|
|
// that expect the old behavior to trigger something quickly.
|
|
|
|
for ( int round = 0; head && round < 2; round++ ) {
|
|
Event* event = head;
|
|
head = nullptr;
|
|
tail = nullptr;
|
|
|
|
while ( event ) {
|
|
Event* next = event->NextEvent();
|
|
|
|
current = event;
|
|
event->Dispatch();
|
|
Unref(event);
|
|
|
|
++event_mgr.num_events_dispatched;
|
|
event = next;
|
|
}
|
|
}
|
|
|
|
// Note: we might eventually need a general way to specify things to
|
|
// do after draining events.
|
|
current = nullptr;
|
|
|
|
// Make sure all of the triggers get processed every time the events
|
|
// drain.
|
|
detail::trigger_mgr->Process();
|
|
}
|
|
|
|
void EventMgr::Describe(ODesc* d) const {
|
|
int n = 0;
|
|
Event* e;
|
|
for ( e = head; e; e = e->NextEvent() )
|
|
++n;
|
|
|
|
d->AddCount(n);
|
|
|
|
for ( e = head; e; e = e->NextEvent() ) {
|
|
e->Describe(d);
|
|
d->NL();
|
|
}
|
|
}
|
|
|
|
void EventMgr::Process() {
|
|
// While it semes like the most logical thing to do, we dont want
|
|
// to call Drain() as part of this method. It will get called at
|
|
// the end of run_loop after all of the sources have been processed
|
|
// and had the opportunity to spawn new events.
|
|
}
|
|
|
|
void EventMgr::InitPostScript() { iosource_mgr->Register(this, true, false); }
|
|
|
|
} // namespace zeek
|