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

Restore globally-namespaced plugin_mgr variable, move zeek::plugin::plugin_mgr to zeek::plugin_mgr

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-07-15 16:45:27 -07:00
parent 9400b863ea
commit 834b76f94f
7 changed files with 35 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/plugin/Plugin.cc
View file

@ -347,27 +347,27 @@ void Plugin::AddComponent(zeek::plugin::Component* c)
Plugin::hook_list Plugin::EnabledHooks() const
{
return plugin_mgr->HooksEnabledForPlugin(this);
return zeek::plugin_mgr->HooksEnabledForPlugin(this);
}
void Plugin::EnableHook(zeek::plugin::HookType hook, int priority)
{
plugin_mgr->EnableHook(hook, this, priority);
zeek::plugin_mgr->EnableHook(hook, this, priority);
}
void Plugin::DisableHook(zeek::plugin::HookType hook)
{
plugin_mgr->DisableHook(hook, this);
zeek::plugin_mgr->DisableHook(hook, this);
}
void Plugin::RequestEvent(EventHandlerPtr handler)
{
plugin_mgr->RequestEvent(handler, this);
zeek::plugin_mgr->RequestEvent(handler, this);
}
void Plugin::RequestBroObjDtor(Obj* obj)
{
plugin_mgr->RequestBroObjDtor(obj, this);
zeek::plugin_mgr->RequestBroObjDtor(obj, this);
}
int Plugin::HookLoadFile(const LoadType type, const std::string& file, const std::string& resolved)