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

Merge remote branch 'origin/master' into topic/robin/logging-internals

Browse source 
Conflicts:
	policy/bro.init
	src/builtin-func.l
This commit is contained in:
Robin Sommer 2011-02-25 16:11:03 -08:00
commit e3b2748fa6
63 changed files with 952 additions and 547 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/NetVar.cc
View file

@ -263,6 +263,7 @@ TableType* id_table;
RecordType* log_filter;
#include "const.bif.netvar_def"
#include "types.bif.netvar_def"
#include "event.bif.netvar_def"
void init_event_handlers()
@ -299,7 +300,7 @@ void init_general_global_var()
ssl_passphrase = internal_val("ssl_passphrase")->AsStringVal();
packet_filter_default = opt_internal_int("packet_filter_default");
sig_max_group_size = opt_internal_int("sig_max_group_size");
enable_syslog = opt_internal_int("enable_syslog");
@ -318,6 +319,7 @@ void init_general_global_var()
void init_net_var()
{
#include "const.bif.netvar_init"
#include "types.bif.netvar_init"
conn_id = internal_type("conn_id")->AsRecordType();
endpoint = internal_type("endpoint")->AsRecordType();