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

Merge branch 'master' into topic/gilbert/plugin-api-tweak

Browse source 
Conflicts:
	testing/btest/Baseline/plugins.api-version-mismatch/output
	testing/btest/Baseline/plugins.hooks/output
	testing/btest/plugins/api-version-mismatch.sh
This commit is contained in:
Gilbert Clark 2014-11-24 16:21:23 -05:00
commit 7eadcad674
139 changed files with 3194 additions and 1385 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/plugin/Manager.cc
View file

@ -172,7 +172,7 @@ bool Manager::ActivateDynamicPluginInternal(const std::string& name, bool ok_if_
// Load {bif,scripts}/__load__.bro automatically.
string init = dir + "lib/bif/__load__.bro";
string init = dir + "scripts/__load__.bro";
if ( is_file(init) )
{
@ -180,7 +180,7 @@ bool Manager::ActivateDynamicPluginInternal(const std::string& name, bool ok_if_
scripts_to_load.push_back(init);
}
init = dir + "scripts/__load__.bro";
init = dir + "lib/bif/__load__.bro";
if ( is_file(init) )
{
@ -559,7 +559,7 @@ int Manager::HookLoadFile(const string& file)
return rc;
}
ValWrapper* Manager::HookCallFunction(const Func* func, Frame* parent, val_list* vargs) const
std::pair<Val*, bool> Manager::HookCallFunction(const Func* func, Frame* parent, val_list* vargs) const
{
HookArgumentList args;
@ -573,7 +573,7 @@ ValWrapper* Manager::HookCallFunction(const Func* func, Frame* parent, val_list*
hook_list* l = hooks[HOOK_CALL_FUNCTION];
ValWrapper* v = 0;
std::pair<Val*, bool> v;
if ( l )
for ( hook_list::iterator i = l->begin(); i != l->end(); ++i )
@ -582,9 +582,11 @@ ValWrapper* Manager::HookCallFunction(const Func* func, Frame* parent, val_list*
v = p->HookCallFunction(func, parent, vargs);
if ( v && v-> processed)
if ( v.second )
{
break;
}
}
}
if ( HavePluginForHook(META_HOOK_POST) )
MetaHookPost(HOOK_CALL_FUNCTION, args, HookArgument(v));