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

Move packet_mgr to the zeek namespace

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-09-24 09:56:55 -07:00
parent 8feca7291b
commit 23bbe0ac38
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/packet_analysis/Manager.h
View file

@ -8,7 +8,8 @@
#include "iosource/Packet.h" #include "iosource/Packet.h"
#include "Dispatcher.h" #include "Dispatcher.h"
namespace zeek::packet_analysis { namespace zeek {
namespace packet_analysis {
class Analyzer; class Analyzer;
using AnalyzerPtr = std::shared_ptr<Analyzer>; using AnalyzerPtr = std::shared_ptr<Analyzer>;
@ -93,6 +94,8 @@ private:
AnalyzerPtr root_analyzer = nullptr; AnalyzerPtr root_analyzer = nullptr;
}; };
} } // namespace packet_analysis
extern zeek::packet_analysis::Manager* packet_mgr; extern zeek::packet_analysis::Manager* packet_mgr;
} // namespace zeek

2
src/zeek-setup.cc
View file

@ -93,7 +93,7 @@ zeek::ValManager* zeek::val_mgr = nullptr;
zeek::ValManager*& val_mgr = zeek::val_mgr; zeek::ValManager*& val_mgr = zeek::val_mgr;
zeek::analyzer::Manager* zeek::analyzer_mgr = nullptr; zeek::analyzer::Manager* zeek::analyzer_mgr = nullptr;
zeek::analyzer::Manager*& analyzer_mgr = zeek::analyzer_mgr; zeek::analyzer::Manager*& analyzer_mgr = zeek::analyzer_mgr;
zeek::packet_analysis::Manager* packet_mgr = nullptr; zeek::packet_analysis::Manager* zeek::packet_mgr = nullptr;
zeek::plugin::Manager* zeek::plugin_mgr = nullptr; zeek::plugin::Manager* zeek::plugin_mgr = nullptr;
zeek::plugin::Manager*& plugin_mgr = zeek::plugin_mgr; zeek::plugin::Manager*& plugin_mgr = zeek::plugin_mgr;