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

3
src/plugin/Manager.h
View file

@ -3,6 +3,7 @@
#ifndef PLUGIN_MANAGER_H
#define PLUGIN_MANAGER_H
#include <utility>
#include <map>
#include "Plugin.h"
@ -244,7 +245,7 @@ public:
* functions and events, it may be any Val and must be ignored). If no
* plugin handled the call, the method returns null.
*/
ValWrapper* HookCallFunction(const Func* func, Frame *parent, val_list* args) const;
std::pair<Val*, bool> HookCallFunction(const Func* func, Frame *parent, val_list* args) const;
/**
* Hook that filters the queuing of an event.