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

Fixes for the builtin plugin functionality

Browse source
This commit is contained in:
Seth Hall 2021-06-11 17:52:27 +00:00
parent 623f2b4e71
commit 8222193525
5 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/plugin/Manager.cc
View file

@ -415,21 +415,28 @@ void Manager::RegisterBifFile(const char* plugin, bif_init_func c)
void Manager::ExtendZeekPathForPlugins()
{
// Extend the path outside of the loop to avoid looking through a longer path for each plugin
vector<string> path_additions;
for ( const auto& p : Manager::ActivePlugins() )
{
if ( p->DynamicPlugin() || p->Name().empty() )
continue;
string canon = std::regex_replace(p->Name(), std::regex("::"), "_");
string dir = "plugins/" + canon + "/";
string dir = "builtin-plugins/" + canon;
// Use find_file to find the directory in the path.
string script_dir = util::find_file(dir, util::zeek_path());
if ( ! util::is_dir(script_dir) )
if ( script_dir.empty() || ! util::is_dir(script_dir) )
continue;
DBG_LOG(DBG_PLUGINS, " Adding %s to ZEEKPATH", script_dir.c_str());
util::detail::add_to_zeek_path(script_dir);
path_additions.push_back(script_dir);
}
for ( const auto& plugin_path : path_additions )
util::detail::add_to_zeek_path(plugin_path);
}
void Manager::InitPreScript()