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

Merge branch 'master' of ssh://git.bro-ids.org/bro into topic/gilbert/plugin-api-tweak

Browse source
This commit is contained in:
Gilbert Clark 2015-02-23 00:00:38 -05:00
commit ce18a2867e
253 changed files with 10283 additions and 2678 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/plugin/ComponentManager.h
View file

@ -243,7 +243,8 @@ void ComponentManager<T, C>::RegisterComponent(C* component,
// Install an identfier for enum value
string id = fmt("%s%s", prefix.c_str(), cname.c_str());
tag_enum_type->AddName(module, id.c_str(),
component->Tag().AsEnumVal()->InternalInt(), true);
component->Tag().AsEnumVal()->InternalInt(), true,
false);
}
} // namespace plugin

4
src/plugin/Manager.cc
View file

@ -172,7 +172,7 @@ bool Manager::ActivateDynamicPluginInternal(const std::string& name, bool ok_if_
// Load {bif,scripts}/__load__.bro automatically.
string init = dir + "scripts/__load__.bro";
string init = dir + "lib/bif/__load__.bro";
if ( is_file(init) )
{
@ -180,7 +180,7 @@ bool Manager::ActivateDynamicPluginInternal(const std::string& name, bool ok_if_
scripts_to_load.push_back(init);
}
init = dir + "lib/bif/__load__.bro";
init = dir + "scripts/__load__.bro";
if ( is_file(init) )
{