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

Update script search logic for new file extension

Browse source 
When searching for script files, look for both the new and old file
extensions.  If a file with ".zeek" can't be found, then search for
a file with ".bro" as a fallback.
This commit is contained in:
Daniel Thayer 2019-04-09 01:26:16 -05:00
parent bff8392ad4
commit 7366155bad
9 changed files with 129 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/plugin/Manager.cc
View file

@ -13,6 +13,7 @@
#include "../Reporter.h"
#include "../Func.h"
#include "../Event.h"
#include "../util.h"
using namespace plugin;
@ -182,30 +183,44 @@ bool Manager::ActivateDynamicPluginInternal(const std::string& name, bool ok_if_
add_to_bro_path(scripts);
}
// First load {scripts}/__preload__.bro automatically.
string init = dir + "scripts/__preload__.bro";
string init;
if ( is_file(init) )
// First load {scripts}/__preload__.bro automatically.
for (const string& ext : script_extensions)
{
DBG_LOG(DBG_PLUGINS, " Loading %s", init.c_str());
scripts_to_load.push_back(init);
init = dir + "scripts/__preload__" + ext;
if ( is_file(init) )
{
DBG_LOG(DBG_PLUGINS, " Loading %s", init.c_str());
scripts_to_load.push_back(init);
break;
}
}
// Load {bif,scripts}/__load__.bro automatically.
init = dir + "lib/bif/__load__.bro";
if ( is_file(init) )
for (const string& ext : script_extensions)
{
DBG_LOG(DBG_PLUGINS, " Loading %s", init.c_str());
scripts_to_load.push_back(init);
init = dir + "lib/bif/__load__" + ext;
if ( is_file(init) )
{
DBG_LOG(DBG_PLUGINS, " Loading %s", init.c_str());
scripts_to_load.push_back(init);
break;
}
}
init = dir + "scripts/__load__.bro";
if ( is_file(init) )
for (const string& ext : script_extensions)
{
DBG_LOG(DBG_PLUGINS, " Loading %s", init.c_str());
scripts_to_load.push_back(init);
init = dir + "scripts/__load__" + ext;
if ( is_file(init) )
{
DBG_LOG(DBG_PLUGINS, " Loading %s", init.c_str());
scripts_to_load.push_back(init);
break;
}
}
// Load shared libraries.