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

Merge remote branch 'origin/master' into topic/seth/ssl-binpac

Browse source 
Conflicts:
	src/bro.bif
This commit is contained in:
Seth Hall 2011-05-23 17:09:41 -04:00
commit 15bfa23ce1
222 changed files with 2711 additions and 1846 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/NetVar.cc
View file

@ -259,6 +259,8 @@ int record_all_packets;
RecordType* script_id;
TableType* id_table;
StringVal* cmd_line_bpf_filter;
#include "const.bif.netvar_def"
#include "types.bif.netvar_def"
#include "event.bif.netvar_def"
@ -312,6 +314,9 @@ void init_general_global_var()
trace_output_file = internal_val("trace_output_file")->AsStringVal();
record_all_packets = opt_internal_int("record_all_packets");
cmd_line_bpf_filter =
internal_val("cmd_line_bpf_filter")->AsStringVal();
}
void init_net_var()