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

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

20
src/plugin/Plugin.cc
View file

@ -133,21 +133,14 @@ void HookArgument::Describe(ODesc* d) const
break;
case WRAPPED_VAL:
if ( arg.wrapper )
d->Add("wrapped(");
if(wrapper.first)
{
d->Add("wrapped(");
if(arg.wrapper->value)
{
arg.wrapper->value->Describe(d);
}
else
d->Add("<null>");
d->Add(")");
wrapper.first->Describe(d);
}
else
{
d->Add("<null>");
}
d->Add(")");
break;
@ -298,9 +291,10 @@ int Plugin::HookLoadFile(const std::string& file, const std::string& ext)
return -1;
}
ValWrapper* Plugin::HookCallFunction(const Func* func, Frame *parent, val_list* args)
std::pair<Val*, bool> Plugin::HookCallFunction(const Func* func, Frame *parent, val_list* args)
{
return 0;
std::pair<Val*, bool> result(NULL, false);
return result;
}
bool Plugin::HookQueueEvent(Event* event)