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

Deprecate Plugin::HookCallFunction(), replace with HookFunctionCall()

Browse source 
This also changes the argument type of Func::operator() to zeek::Args*
to allow plugins to be able to alter function arguments in place as
was previously documented.
This commit is contained in:
Jon Siwek 2020-05-22 21:01:38 -07:00
parent 46c5dea733
commit 272db640aa
27 changed files with 417 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/plugin/Manager.cc
View file

@ -624,43 +624,35 @@ int Manager::HookLoadFile(const Plugin::LoadType type, const string& file, const
std::pair<bool, IntrusivePtr<Val>>
Manager::HookCallFunction(const Func* func, Frame* parent,
const zeek::Args& vecargs) const
zeek::Args* vecargs) const
{
HookArgumentList args;
std::optional<val_list> vargs;
val_list vargs;
if ( HavePluginForHook(META_HOOK_PRE) )
{
vargs = val_list(vecargs.size());
vargs.resize(vecargs->size());
for ( const auto& v : vecargs )
vargs->push_back(v.get());
for ( const auto& v : *vecargs )
vargs.push_back(v.get());
args.push_back(HookArgument(func));
args.push_back(HookArgument(parent));
args.push_back(HookArgument(&vargs.value()));
args.push_back(HookArgument(&vargs));
MetaHookPre(HOOK_CALL_FUNCTION, args);
}
hook_list* l = hooks[HOOK_CALL_FUNCTION];
std::pair<bool, Val*> rval{false, nullptr};
std::pair<bool, IntrusivePtr<Val>> rval{false, nullptr};
if ( l )
{
if ( ! vargs )
{
vargs = val_list(vecargs.size());
for ( const auto& v : vecargs )
vargs->push_back(v.get());
}
for ( hook_list::iterator i = l->begin(); i != l->end(); ++i )
{
Plugin* p = (*i).second;
rval = p->HookCallFunction(func, parent, &vargs.value());
rval = p->HookFunctionCall(func, parent, vecargs);
if ( rval.first )
break;
@ -668,9 +660,10 @@ Manager::HookCallFunction(const Func* func, Frame* parent,
}
if ( HavePluginForHook(META_HOOK_POST) )
MetaHookPost(HOOK_CALL_FUNCTION, args, HookArgument(rval));
MetaHookPost(HOOK_CALL_FUNCTION, args,
HookArgument(std::make_pair(rval.first, rval.second.get())));
return {rval.first, {AdoptRef{}, rval.second}};
return rval;
}
bool Manager::HookQueueEvent(Event* event) const