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

Merge branch 'topic/bernhard/input' into topic/bernhard/input-threads

Browse source 
most stuff is inplace, logging framework needs a few changes merged before continuing here...

Conflicts:
	src/CMakeLists.txt
	src/LogMgr.h
	src/logging/Manager.cc
	src/main.cc
This commit is contained in:
Bernhard Amann 2012-02-06 10:54:07 -08:00
commit f6c6387c52
48 changed files with 3399 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main.cc
View file

@ -52,6 +52,8 @@ extern "C" void OPENSSL_add_all_algorithms_conf(void);
#include "logging/Manager.h"
#include "logging/writers/Ascii.h"
#include "input/Manager.h"
#include "binpac_bro.h"
Brofiler brofiler;
@ -79,6 +81,7 @@ DNS_Mgr* dns_mgr;
TimerMgr* timer_mgr;
logging::Manager* log_mgr = 0;
threading::Manager* thread_mgr = 0;
input::Manager* input_mgr = 0;
Stmt* stmts;
EventHandlerPtr net_done = 0;
RuleMatcher* rule_matcher = 0;
@ -743,6 +746,7 @@ int main(int argc, char** argv)
remote_serializer = new RemoteSerializer();
event_registry = new EventRegistry();
log_mgr = new logging::Manager();
input_mgr = new input::Manager();
if ( events_file )
event_player = new EventPlayer(events_file);