mirror of
https://github.com/zeek/zeek.git
synced 2025-10-09 18:18:19 +00:00
af1809aaa3
This is a larger internal change that moves the analyzer
infrastructure to a more flexible model where the available analyzers
don't need to be hardcoded at compile time anymore. While currently
they actually still are, this will in the future enable external
analyzer plugins. For now, it does already add the capability to
dynamically enable/disable analyzers from script-land, replacing the
old Analyzer::Available() methods.
There are three major parts going into this:
- A new plugin infrastructure in src/plugin. This is independent
of analyzers and will eventually support plugins for other parts
of Bro as well (think: readers and writers). The goal is that
plugins can be alternatively compiled in statically or loadead
dynamically at runtime from a shared library. While the latter
isn't there yet, there'll be almost no code change for a plugin
to make it dynamic later (hopefully :)
- New analyzer infrastructure in src/analyzer. I've moved a number
of analyzer-related classes here, including Analyzer and DPM;
the latter now renamed to Analyzer::Manager. More will move here
later. Currently, there's only one plugin here, which provides
*all* existing analyzers. We can modularize this further in the
future (or not).
- A new script interface in base/framework/analyzer. I think that
this will eventually replace the dpm framework, but for now
that's still there as well, though some parts have moved over.
I've also remove the dpd_config table; ports are now configured via
the analyzer framework. For exmaple, for SSH:
const ports = { 22/tcp } &redef;
event bro_init() &priority=5
{
...
Analyzer::register_for_ports(Analyzer::ANALYZER_SSH, ports);
}
As you can see, the old ANALYZER_SSH constants have more into an enum
in the Analyzer namespace.
This is all hardly tested right now, and not everything works yet.
There's also a lot more cleanup to do (moving more classes around;
removing no longer used functionality; documenting script and C++
interfaces; regression tests). But it seems to generally work with a
small trace at least.
The debug stream "dpm" shows more about the loaded/enabled analyzers.
A new option -N lists loaded plugins and what they provide (including
those compiled in statically; i.e., right now it outputs all the
analyzers).
This is all not cast-in-stone yet, for some things we need to see if
they make sense this way. Feedback welcome.
137 lines
2.8 KiB
C++
137 lines
2.8 KiB
C++
// See the file "COPYING" in the main distribution directory for copyright.
|
|
|
|
#ifndef event_h
|
|
#define event_h
|
|
|
|
#include "EventRegistry.h"
|
|
#include "Serializer.h"
|
|
|
|
#include "analyzer/Tag.h"
|
|
#include "analyzer/Analyzer.h"
|
|
|
|
class EventMgr;
|
|
|
|
class Event : public BroObj {
|
|
public:
|
|
Event(EventHandlerPtr handler, val_list* args,
|
|
SourceID src = SOURCE_LOCAL, analyzer::ID aid = 0,
|
|
TimerMgr* mgr = 0, BroObj* obj = 0);
|
|
~Event();
|
|
|
|
void SetNext(Event* n) { next_event = n; }
|
|
Event* NextEvent() const { return next_event; }
|
|
|
|
SourceID Source() const { return src; }
|
|
analyzer::ID Analyzer() const { return aid; }
|
|
TimerMgr* Mgr() const { return mgr; }
|
|
|
|
void Describe(ODesc* d) const;
|
|
|
|
protected:
|
|
friend class EventMgr;
|
|
|
|
// This method is protected to make sure that everybody goes through
|
|
// EventMgr::Dispatch().
|
|
void Dispatch(bool no_remote = false)
|
|
{
|
|
if ( event_serializer )
|
|
{
|
|
SerialInfo info(event_serializer);
|
|
event_serializer->Serialize(&info, handler->Name(), args);
|
|
}
|
|
|
|
if ( handler->ErrorHandler() )
|
|
reporter->BeginErrorHandler();
|
|
|
|
try
|
|
{
|
|
handler->Call(args, no_remote);
|
|
}
|
|
|
|
catch ( InterpreterException& e )
|
|
{
|
|
// Already reported.
|
|
}
|
|
|
|
if ( obj )
|
|
// obj->EventDone();
|
|
Unref(obj);
|
|
|
|
if ( handler->ErrorHandler() )
|
|
reporter->EndErrorHandler();
|
|
}
|
|
|
|
EventHandlerPtr handler;
|
|
val_list* args;
|
|
SourceID src;
|
|
analyzer::ID aid;
|
|
TimerMgr* mgr;
|
|
BroObj* obj;
|
|
Event* next_event;
|
|
};
|
|
|
|
extern int num_events_queued;
|
|
extern int num_events_dispatched;
|
|
|
|
class EventMgr : public BroObj {
|
|
public:
|
|
EventMgr();
|
|
~EventMgr();
|
|
|
|
void QueueEvent(EventHandlerPtr h, val_list* vl,
|
|
SourceID src = SOURCE_LOCAL, analyzer::ID aid = 0,
|
|
TimerMgr* mgr = 0, BroObj* obj = 0)
|
|
{
|
|
if ( h )
|
|
QueueEvent(new Event(h, vl, src, aid, mgr, obj));
|
|
else
|
|
delete_vals(vl);
|
|
}
|
|
|
|
void Dispatch();
|
|
|
|
void Dispatch(Event* event, bool no_remote = false)
|
|
{
|
|
current_src = event->Source();
|
|
event->Dispatch(no_remote);
|
|
Unref(event);
|
|
}
|
|
|
|
void Drain();
|
|
bool IsDraining() const { return draining; }
|
|
|
|
int HasEvents() const { return head != 0; }
|
|
|
|
// Returns the source ID of last raised event.
|
|
SourceID CurrentSource() const { return current_src; }
|
|
|
|
// Returns the ID of the analyzer which raised the last event, or 0 if
|
|
// non-analyzer event.
|
|
analyzer::ID CurrentAnalyzer() const { return current_aid; }
|
|
|
|
// Returns the timer mgr associated with the last raised event.
|
|
TimerMgr* CurrentTimerMgr() const { return current_mgr; }
|
|
|
|
int Size() const
|
|
{ return num_events_queued - num_events_dispatched; }
|
|
|
|
// Returns a peer record describing the local Bro.
|
|
RecordVal* GetLocalPeerVal();
|
|
|
|
void Describe(ODesc* d) const;
|
|
|
|
protected:
|
|
void QueueEvent(Event* event);
|
|
|
|
Event* head;
|
|
Event* tail;
|
|
SourceID current_src;
|
|
analyzer::ID current_aid;
|
|
TimerMgr* current_mgr;
|
|
RecordVal* src_val;
|
|
bool draining;
|
|
};
|
|
|
|
extern EventMgr mgr;
|
|
|
|
#endif
|