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

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

Browse source 
Conflicts:
	src/NetVar.cc
	src/NetVar.h
This commit is contained in:
Bernhard Amann 2013-08-30 08:43:47 -07:00
commit 2dd0d057e6
28 changed files with 333 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/main.cc
View file

@ -124,6 +124,14 @@ vector<string> params;
char* proc_status_file = 0;
int snaplen = 0; // this gets set from the scripting-layer's value
OpaqueType* md5_type = 0;
OpaqueType* sha1_type = 0;
OpaqueType* sha256_type = 0;
OpaqueType* entropy_type = 0;
OpaqueType* cardinality_type = 0;
OpaqueType* topk_type = 0;
OpaqueType* bloomfilter_type = 0;
extern std::list<BroDoc*> docs_generated;
// Keep copy of command line
@ -845,6 +853,14 @@ int main(int argc, char** argv)
input::reader::Raw::ClassInit();
md5_type = new OpaqueType("md5");
sha1_type = new OpaqueType("sha1");
sha256_type = new OpaqueType("sha256");
entropy_type = new OpaqueType("entropy");
cardinality_type = new OpaqueType("cardinality");
topk_type = new OpaqueType("topk");
bloomfilter_type = new OpaqueType("bloomfilter");
// The leak-checker tends to produce some false
// positives (memory which had already been
// allocated before we start the checking is