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

Add namespaced version of trigger_mgr, fix a couple uses of event_registry

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-08-04 16:47:21 -07:00
parent 715ca6549b
commit ca9baec6e8
5 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Event.cc
View file

@ -199,7 +199,7 @@ void EventMgr::Drain()
// Make sure all of the triggers get processed every time the events // Make sure all of the triggers get processed every time the events
// drain. // drain.
trigger_mgr->Process(); zeek::detail::trigger_mgr->Process();
} }
void EventMgr::Describe(ODesc* d) const void EventMgr::Describe(ODesc* d) const

2
src/Stats.cc
View file

@ -198,7 +198,7 @@ void ProfileLogger::Log()
dstats.cached_hosts, dstats.cached_addresses)); dstats.cached_hosts, dstats.cached_addresses));
zeek::detail::trigger::Manager::Stats tstats; zeek::detail::trigger::Manager::Stats tstats;
trigger_mgr->GetStats(&tstats); zeek::detail::trigger_mgr->GetStats(&tstats);
file->Write(fmt("%.06f Triggers: total=%lu pending=%lu\n", network_time, tstats.total, tstats.pending)); file->Write(fmt("%.06f Triggers: total=%lu pending=%lu\n", network_time, tstats.total, tstats.pending));

4
src/Trigger.cc
View file

@ -454,7 +454,7 @@ bool Trigger::Cache(const zeek::detail::CallExpr* expr, Val* v)
Ref(v); Ref(v);
trigger_mgr->Queue(this); zeek::detail::trigger_mgr->Queue(this);
return true; return true;
} }
@ -480,7 +480,7 @@ void Trigger::Describe(ODesc* d) const
void Trigger::Modified(zeek::notifier::detail::Modifiable* m) void Trigger::Modified(zeek::notifier::detail::Modifiable* m)
{ {
trigger_mgr->Queue(this); zeek::detail::trigger_mgr->Queue(this);
} }
const char* Trigger::Name() const const char* Trigger::Name() const

16
src/Trigger.h
View file

@ -18,7 +18,9 @@ ZEEK_FORWARD_DECLARE_NAMESPACED(Expr, zeek::detail);
ZEEK_FORWARD_DECLARE_NAMESPACED(CallExpr, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(CallExpr, zeek::detail);
ZEEK_FORWARD_DECLARE_NAMESPACED(ID, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(ID, zeek::detail);
namespace zeek::detail::trigger { namespace zeek::detail {
namespace trigger {
// Triggers are the heart of "when" statements: expressions that when // Triggers are the heart of "when" statements: expressions that when
// they become true execute a body of statements. // they become true execute a body of statements.
@ -143,11 +145,15 @@ private:
unsigned long total_triggers = 0; unsigned long total_triggers = 0;
}; };
} // namespace zeek::detail::trigger } // namespace trigger
extern trigger::Manager* trigger_mgr;
} // namespace zeek::detail
namespace trigger { namespace trigger {
using Trigger [[deprecated("Remove in v4.1. Use zeek::detail::trigger::Trigger instead")]] = zeek::detail::trigger::Trigger; using Trigger [[deprecated("Remove in v4.1. Use zeek::detail::trigger::Trigger.")]] = zeek::detail::trigger::Trigger;
using Manager [[deprecated("Remove in v4.1. Use zeek::detail::trigger::Manager instead")]] = zeek::detail::trigger::Manager; using Manager [[deprecated("Remove in v4.1. Use zeek::detail::trigger::Manager.")]] = zeek::detail::trigger::Manager;
} }
extern zeek::detail::trigger::Manager* trigger_mgr; extern zeek::detail::trigger::Manager*& trigger_mgr [[deprecated("Remove in v4.1. Use zeek::detail::trigger_mgr.")]];

11
src/zeek-setup.cc
View file

@ -116,7 +116,8 @@ zeek::iosource::Manager*& iosource_mgr = zeek::iosource_mgr;
zeek::Broker::Manager* zeek::broker_mgr = nullptr; zeek::Broker::Manager* zeek::broker_mgr = nullptr;
zeek::Broker::Manager*& broker_mgr = zeek::broker_mgr; zeek::Broker::Manager*& broker_mgr = zeek::broker_mgr;
zeek::Supervisor* zeek::supervisor_mgr = nullptr; zeek::Supervisor* zeek::supervisor_mgr = nullptr;
zeek::detail::trigger::Manager* trigger_mgr = nullptr; zeek::detail::trigger::Manager* zeek::detail::trigger_mgr = nullptr;
zeek::detail::trigger::Manager*& trigger_mgr = zeek::detail::trigger_mgr;
std::vector<std::string> zeek_script_prefixes; std::vector<std::string> zeek_script_prefixes;
zeek::detail::Stmt* stmts; zeek::detail::Stmt* stmts;
@ -583,14 +584,14 @@ zeek::detail::SetupResult zeek::detail::setup(int argc, char** argv,
zeek::detail::dns_mgr->SetDir(".state"); zeek::detail::dns_mgr->SetDir(".state");
zeek::iosource_mgr = new iosource::Manager(); zeek::iosource_mgr = new iosource::Manager();
event_registry = new EventRegistry(); zeek::event_registry = new EventRegistry();
zeek::analyzer_mgr = new analyzer::Manager(); zeek::analyzer_mgr = new analyzer::Manager();
zeek::log_mgr = new logging::Manager(); zeek::log_mgr = new logging::Manager();
zeek::input_mgr = new input::Manager(); zeek::input_mgr = new input::Manager();
zeek::file_mgr = new file_analysis::Manager(); zeek::file_mgr = new file_analysis::Manager();
auto broker_real_time = ! options.pcap_file && ! options.deterministic_mode; auto broker_real_time = ! options.pcap_file && ! options.deterministic_mode;
broker_mgr = new zeek::Broker::Manager(broker_real_time); zeek::broker_mgr = new zeek::Broker::Manager(broker_real_time);
trigger_mgr = new zeek::detail::trigger::Manager(); zeek::detail::trigger_mgr = new zeek::detail::trigger::Manager();
zeek::plugin_mgr->InitPreScript(); zeek::plugin_mgr->InitPreScript();
zeek::analyzer_mgr->InitPreScript(); zeek::analyzer_mgr->InitPreScript();
@ -819,7 +820,7 @@ zeek::detail::SetupResult zeek::detail::setup(int argc, char** argv,
zeek::event_mgr.Enqueue(zeek_init, zeek::Args{}); zeek::event_mgr.Enqueue(zeek_init, zeek::Args{});
EventRegistry::string_list dead_handlers = EventRegistry::string_list dead_handlers =
event_registry->UnusedHandlers(); zeek::event_registry->UnusedHandlers();
if ( ! dead_handlers.empty() && check_for_unused_event_handlers ) if ( ! dead_handlers.empty() && check_for_unused_event_handlers )
{ {