Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-03 15:18: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

5
testing/btest/plugins/hooks-plugin/src/Plugin.cc
View file

@ -5,7 +5,6 @@
#include <Event.h>
namespace plugin { namespace Demo_Hooks { Plugin plugin; } }
using plugin::ValWrapper;
using namespace plugin::Demo_Hooks;
@ -49,7 +48,7 @@ int Plugin::HookLoadFile(const std::string& file, const std::string& ext)
return -1;
}
ValWrapper* Plugin::HookCallFunction(const Func* func, Frame* frame, val_list* args)
std::pair<Val*, bool> Plugin::HookCallFunction(const Func* func, Frame* frame, val_list* args)
{
ODesc d;
d.SetShort();
@ -58,7 +57,7 @@ ValWrapper* Plugin::HookCallFunction(const Func* func, Frame* frame, val_list* a
fprintf(stderr, "%.6f %-15s %s\n", network_time, "| HookCallFunction",
d.Description());
return 0;
return std::pair<Val*, bool>(NULL, false);
}
bool Plugin::HookQueueEvent(Event* event)

2
testing/btest/plugins/hooks-plugin/src/Plugin.h
View file

@ -11,7 +11,7 @@ class Plugin : public ::plugin::Plugin
{
protected:
virtual int HookLoadFile(const std::string& file, const std::string& ext);
virtual plugin::ValWrapper* HookCallFunction(const Func* func, Frame* frame, val_list* args);
virtual std::pair<Val*, bool> HookCallFunction(const Func* func, Frame* frame, val_list* args);
virtual bool HookQueueEvent(Event* event);
virtual void HookDrainEvents();
virtual void HookUpdateNetworkTime(double network_time);