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

Add hook 'HookAddToAnalyzerTree' to support TCPRS plugin

Browse source 
This commit introduces a new hook, HookAddToAnalyzerTree, which
allows plugins to add a new analyzer to the analyzer tree during
analyzer tree creation. This hook is necessary to support the
TCPRS plugin.

Additionally, the order in which the scripts were loaded has been
changed to address a problem with undefined variable errors due
to load order issues.

Signed-off-by: James Swaro <james.swaro@gmail.com>
This commit is contained in:
James Swaro 2015-07-26 12:46:45 -05:00
parent 30bb17ea8d
commit 85fd1c9fa7
5 changed files with 43 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/analyzer/Manager.cc
View file

@ -505,6 +505,8 @@ bool Manager::BuildInitialAnalyzerTree(Connection* conn)
if ( ! analyzed ) if ( ! analyzed )
conn->SetLifetime(non_analyzed_lifetime); conn->SetLifetime(non_analyzed_lifetime);
PLUGIN_HOOK_VOID(HOOK_ADD_TO_ANALYZER_TREE, HookAddToAnalyzerTree(conn));
return true; return true;
} }

34
src/plugin/Manager.cc
View file

@ -183,8 +183,9 @@ bool Manager::ActivateDynamicPluginInternal(const std::string& name, bool ok_if_
} }
// Load {bif,scripts}/__load__.bro automatically. // Load {bif,scripts}/__load__.bro automatically.
// Load scripts/__load__.bro first to avoid issue with undefined variables
string init = dir + "lib/bif/__load__.bro"; // from the plugin
string init = dir + "scripts/__load__.bro";
if ( is_file(init) ) if ( is_file(init) )
{ {
@ -192,7 +193,7 @@ bool Manager::ActivateDynamicPluginInternal(const std::string& name, bool ok_if_
scripts_to_load.push_back(init); scripts_to_load.push_back(init);
} }
init = dir + "scripts/__load__.bro"; init = dir + "lib/bif/__load__.bro";
if ( is_file(init) ) if ( is_file(init) )
{ {
@ -660,6 +661,33 @@ void Manager::HookDrainEvents() const
} }
void Manager::HookAddToAnalyzerTree(Connection *conn) const
{
HookArgumentList args;
if ( HavePluginForHook(META_HOOK_PRE) )
{
args.push_back(conn);
MetaHookPre(HOOK_ADD_TO_ANALYZER_TREE, args);
}
hook_list *l = hooks[HOOK_ADD_TO_ANALYZER_TREE];
if ( l )
{
for (hook_list::iterator i = l->begin() ; i != l->end(); ++i)
{
Plugin *p = (*i).second;
p->HookAddToAnalyzerTree(conn);
}
}
if ( HavePluginForHook(META_HOOK_POST) )
{
MetaHookPost(HOOK_ADD_TO_ANALYZER_TREE, args, HookArgument());
}
}
void Manager::HookUpdateNetworkTime(double network_time) const void Manager::HookUpdateNetworkTime(double network_time) const
{ {
HookArgumentList args; HookArgumentList args;

2
src/plugin/Manager.h
View file

@ -264,6 +264,8 @@ public:
*/ */
void HookUpdateNetworkTime(double network_time) const; void HookUpdateNetworkTime(double network_time) const;
void HookAddToAnalyzerTree(Connection *conn) const;
/** /**
* Hook that informs plugins that the event queue is being drained. * Hook that informs plugins that the event queue is being drained.
*/ */

5
src/plugin/Plugin.cc
View file

@ -23,6 +23,7 @@ const char* plugin::hook_name(HookType h)
"DrainEvents", "DrainEvents",
"UpdateNetworkTime", "UpdateNetworkTime",
"BroObjDtor", "BroObjDtor",
"AddToAnalyzerTree",
// MetaHooks // MetaHooks
"MetaHookPre", "MetaHookPre",
"MetaHookPost", "MetaHookPost",
@ -310,6 +311,10 @@ void Plugin::HookUpdateNetworkTime(double network_time)
{ {
} }
void Plugin::HookAddToAnalyzerTree(Connection *conn)
{
}
void Plugin::HookBroObjDtor(void* obj) void Plugin::HookBroObjDtor(void* obj)
{ {
} }

3
src/plugin/Plugin.h
View file

@ -39,6 +39,7 @@ enum HookType {
HOOK_DRAIN_EVENTS, //< Activates Plugin::HookDrainEvents() HOOK_DRAIN_EVENTS, //< Activates Plugin::HookDrainEvents()
HOOK_UPDATE_NETWORK_TIME, //< Activates Plugin::HookUpdateNetworkTime. HOOK_UPDATE_NETWORK_TIME, //< Activates Plugin::HookUpdateNetworkTime.
HOOK_BRO_OBJ_DTOR, //< Activates Plugin::HookBroObjDtor. HOOK_BRO_OBJ_DTOR, //< Activates Plugin::HookBroObjDtor.
HOOK_ADD_TO_ANALYZER_TREE, // Activates Plugin::HookAddToAnalyzerTree
// Meta hooks. // Meta hooks.
META_HOOK_PRE, //< Activates Plugin::MetaHookPre(). META_HOOK_PRE, //< Activates Plugin::MetaHookPre().
@ -636,6 +637,8 @@ protected:
*/ */
virtual void HookUpdateNetworkTime(double network_time); virtual void HookUpdateNetworkTime(double network_time);
virtual void HookAddToAnalyzerTree(Connection *conn);
/** /**
* Hook for destruction of objects registered with * Hook for destruction of objects registered with
* RequestBroObjDtor(). When Bro's reference counting triggers the * RequestBroObjDtor(). When Bro's reference counting triggers the