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

Merge remote-tracking branch 'origin/master' into topic/bernhard/thread-cleanup

Browse source 
Conflicts:
	src/main.cc
This commit is contained in:
Bernhard Amann 2013-05-15 16:00:49 -07:00
commit f389cafc3b
262 changed files with 88998 additions and 160161 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/main.cc
View file

@ -23,6 +23,7 @@ extern "C" {
#endif
#include <openssl/md5.h>
#include <magic.h>
extern "C" void OPENSSL_add_all_algorithms_conf(void);
@ -58,10 +59,15 @@ extern "C" void OPENSSL_add_all_algorithms_conf(void);
#include "logging/Manager.h"
#include "logging/writers/Ascii.h"
#include "file_analysis/Manager.h"
#include "binpac_bro.h"
Brofiler brofiler;
magic_t magic_desc_cookie = 0;
magic_t magic_mime_cookie = 0;
#ifndef HAVE_STRSEP
extern "C" {
char* strsep(char**, const char*);
@ -86,6 +92,7 @@ TimerMgr* timer_mgr;
logging::Manager* log_mgr = 0;
threading::Manager* thread_mgr = 0;
input::Manager* input_mgr = 0;
file_analysis::Manager* file_mgr = 0;
Stmt* stmts;
EventHandlerPtr net_done = 0;
RuleMatcher* rule_matcher = 0;
@ -203,6 +210,7 @@ void usage()
fprintf(stderr, " --use-binpac | use new-style BinPAC parsers when available\n");
fprintf(stderr, " $BROPATH | file search path (%s)\n", bro_path());
fprintf(stderr, " $BROMAGIC | libmagic mime magic database search path (%s)\n", bro_magic_path());
fprintf(stderr, " $BRO_PREFIXES | prefix list (%s)\n", bro_prefixes());
fprintf(stderr, " $BRO_DNS_FAKE | disable DNS lookups (%s)\n", bro_dns_fake());
fprintf(stderr, " $BRO_SEED_FILE | file to load seeds from (not set)\n");
@ -319,6 +327,7 @@ void terminate_bro()
mgr.Drain();
file_mgr->Terminate();
log_mgr->FlushBuffers();
thread_mgr->Terminate();
@ -336,6 +345,7 @@ void terminate_bro()
delete dpm;
delete log_mgr;
delete thread_mgr;
delete file_mgr;
delete reporter;
reporter = 0;
@ -724,6 +734,9 @@ int main(int argc, char** argv)
curl_global_init(CURL_GLOBAL_ALL);
#endif
bro_init_magic(&magic_desc_cookie, MAGIC_NONE);
bro_init_magic(&magic_mime_cookie, MAGIC_MIME);
// FIXME: On systems that don't provide /dev/urandom, OpenSSL doesn't
// seed the PRNG. We should do this here (but at least Linux, FreeBSD
// and Solaris provide /dev/urandom).
@ -775,7 +788,8 @@ int main(int argc, char** argv)
remote_serializer = new RemoteSerializer();
event_registry = new EventRegistry();
log_mgr = new logging::Manager();
input_mgr = new input::Manager();
input_mgr = new input::Manager();
file_mgr = new file_analysis::Manager();
if ( events_file )
event_player = new EventPlayer(events_file);