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

Merge branch 'topic/robin/dynamic-plugins-2.3' of git.bro.org:bro into topic/robin/dynamic-plugins-2.3

Browse source
This commit is contained in:
Robin Sommer 2014-06-18 14:41:40 -07:00
commit 62d07a3fc4
131 changed files with 5188 additions and 899 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,7 +29,7 @@ protected:
return config;
}
virtual int HookLoadFile(const std::string& file);
virtual int HookLoadFile(const std::string& file, const std::string& ext);
virtual Val* HookCallFunction(const Func* func, val_list* args);
virtual bool HookQueueEvent(Event* event);
virtual void HookDrainEvents();
@ -54,11 +54,11 @@ static void describe_hook_args(const HookArgumentList& args, ODesc* d)
}
}
int Plugin::HookLoadFile(const std::string& file)
int Plugin::HookLoadFile(const std::string& file, const std::string& ext)
{
fprintf(stderr, "%.6f %-15s %s\n", network_time, "| HookLoadFile",
file.c_str());
return 0;
fprintf(stderr, "%.6f %-15s %s/%s\n", network_time, "| HookLoadFile",
file.c_str(), ext.c_str());
return -1;
}
Val* Plugin::HookCallFunction(const Func* func, val_list* args)