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

Remove Plugin::HookCallFunction and fix tests related to it

Browse source
This commit is contained in:
Tim Wojtulewicz 2021-01-25 16:36:59 -07:00
parent 725e759560
commit 5f09793ce1
8 changed files with 6 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -56,7 +56,8 @@ int Plugin::HookLoadFile(const LoadType type, const std::string& file, const std
return -1;
}
std::pair<bool, zeek::Val*> Plugin::HookCallFunction(const zeek::Func* func, zeek::detail::Frame* frame, zeek::ValPList* args)
std::pair<bool, zeek::ValPtr> Plugin::HookFunctionCall(const zeek::Func* func, zeek::detail::Frame* frame,
zeek::Args* args)
{
zeek::ODesc d;
d.SetShort();
@ -65,7 +66,7 @@ std::pair<bool, zeek::Val*> Plugin::HookCallFunction(const zeek::Func* func, zee
fprintf(stderr, "%.6f %-15s %s\n", zeek::run_state::network_time, "| HookCallFunction",
d.Description());
return std::pair<bool, zeek::Val*>(false, NULL);
return {false, nullptr};
}
bool Plugin::HookQueueEvent(zeek::Event* event)

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

@ -9,7 +9,8 @@ class Plugin : public zeek::plugin::Plugin
{
protected:
int HookLoadFile(const LoadType type, const std::string& file, const std::string& resolved) override;
std::pair<bool, zeek::Val*> HookCallFunction(const zeek::Func* func, zeek::detail::Frame* frame, zeek::ValPList* args) override;
std::pair<bool, zeek::ValPtr> HookFunctionCall(const zeek::Func* func, zeek::detail::Frame* parent,
zeek::Args* args) override;
bool HookQueueEvent(zeek::Event* event) override;
void HookDrainEvents() override;
void HookUpdateNetworkTime(double network_time) override;