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

Merge remote-tracking branch 'origin/master' into topic/robin/log-threads

Browse source 
Conflicts:
	aux/broccoli
	src/ConnCompressor.cc
This commit is contained in:
Robin Sommer 2012-02-28 16:00:18 -08:00
commit 629ec31ec2
25 changed files with 85 additions and 1556 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main.cc
View file

@ -43,7 +43,6 @@ extern "C" void OPENSSL_add_all_algorithms_conf(void);
#include "PersistenceSerializer.h"
#include "EventRegistry.h"
#include "Stats.h"
#include "ConnCompressor.h"
#include "DPM.h"
#include "BroDoc.h"
#include "Brofiler.h"
@ -98,7 +97,6 @@ int do_notice_analysis = 0;
int rule_bench = 0;
int generate_documentation = 0;
SecondaryPath* secondary_path = 0;
ConnCompressor* conn_compressor = 0;
extern char version[];
char* command_line_policy = 0;
vector<string> params;
@ -301,7 +299,6 @@ void terminate_bro()
delete state_serializer;
delete event_registry;
delete secondary_path;
delete conn_compressor;
delete remote_serializer;
delete dpm;
delete log_mgr;
@ -829,8 +826,6 @@ int main(int argc, char** argv)
delete [] script_rule_files;
conn_compressor = new ConnCompressor();
if ( g_policy_debug )
// ### Add support for debug command file.
dbg_init_debugger(0);