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

Move all of the base plugin classes into the zeek::plugin namespace

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-05-13 17:11:03 -07:00
parent cbdb8ee074
commit e77e8c4b7b
28 changed files with 404 additions and 240 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/plugin/Plugin.cc
View file

@ -17,11 +17,11 @@
#include "../input.h"
#include "threading/SerialTypes.h"
using namespace plugin;
using namespace zeek::plugin;
const char* plugin::hook_name(HookType h)
const char* ::zeek::plugin::hook_name(::zeek::plugin::HookType h)
{
static const char* hook_names[int(NUM_HOOKS) + 1] = {
static constexpr const char* hook_names[int(::zeek::plugin::NUM_HOOKS) + 1] = {
// Order must match that of HookType.
"LoadFile",
"CallFunction",
@ -42,6 +42,11 @@ const char* plugin::hook_name(HookType h)
return hook_names[int(h)];
}
const char* plugin::hook_name(::plugin::HookType h)
{
return hook_name(static_cast<::zeek::plugin::HookType>(h));
}
BifItem::BifItem(const std::string& arg_id, Type arg_type)
{
id = arg_id;
@ -319,7 +324,7 @@ Plugin::component_list Plugin::Components() const
return components;
}
static bool component_cmp(const Component* a, const Component* b)
static bool component_cmp(const zeek::plugin::Component* a, const zeek::plugin::Component* b)
{
return a->Name() < b->Name();
}
@ -336,7 +341,7 @@ void Plugin::AddBifItem(const std::string& name, BifItem::Type type)
bif_items.push_back(bi);
}
void Plugin::AddComponent(Component* c)
void Plugin::AddComponent(zeek::plugin::Component* c)
{
components.push_back(c);
@ -350,12 +355,22 @@ Plugin::hook_list Plugin::EnabledHooks() const
return plugin_mgr->HooksEnabledForPlugin(this);
}
void Plugin::EnableHook(HookType hook, int priority)
void Plugin::EnableHook(::plugin::HookType hook, int priority)
{
plugin_mgr->EnableHook(static_cast<zeek::plugin::HookType>(hook), this, priority);
}
void Plugin::EnableHook(::zeek::plugin::HookType hook, int priority)
{
plugin_mgr->EnableHook(hook, this, priority);
}
void Plugin::DisableHook(HookType hook)
void Plugin::DisableHook(::plugin::HookType hook)
{
plugin_mgr->DisableHook(static_cast<zeek::plugin::HookType>(hook), this);
}
void Plugin::DisableHook(::zeek::plugin::HookType hook)
{
plugin_mgr->DisableHook(hook, this);
}
@ -446,11 +461,19 @@ bool Plugin::HookReporter(const std::string& prefix, const EventHandlerPtr event
return true;
}
void Plugin::MetaHookPre(HookType hook, const HookArgumentList& args)
void Plugin::MetaHookPre(::plugin::HookType hook, const HookArgumentList& args)
{
}
void Plugin::MetaHookPost(HookType hook, const HookArgumentList& args, HookArgument result)
void Plugin::MetaHookPost(::plugin::HookType hook, const HookArgumentList& args, HookArgument result)
{
}
void Plugin::MetaHookPre(::zeek::plugin::HookType hook, const HookArgumentList& args)
{
}
void Plugin::MetaHookPost(::zeek::plugin::HookType hook, const HookArgumentList& args, HookArgument result)
{
}
@ -555,4 +578,3 @@ void Plugin::Describe(ODesc* d) const
d->Add(")\n");
}
}