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 remote-tracking branch 'origin/master' into topic/bernhard/topk

Browse source 
Conflicts:
	src/NetVar.cc
	src/NetVar.h
	src/SerialTypes.h
	src/bro.bif
This commit is contained in:
Bernhard Amann 2013-07-31 11:52:39 -07:00
commit daaf091bc3
310 changed files with 18810 additions and 6086 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/NetVar.h
View file

@ -248,6 +248,7 @@ extern OpaqueType* sha1_type;
extern OpaqueType* sha256_type;
extern OpaqueType* entropy_type;
extern OpaqueType* topk_type;
extern OpaqueType* bloomfilter_type;
// Initializes globals that don't pertain to network/event analysis.
extern void init_general_global_var();