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

Merge branch 'master' into topic/robin/log-threads

Browse source 
Conflicts:
	cmake
This commit is contained in:
Jon Siwek 2012-03-30 12:02:32 -05:00
commit 256c0af98e
77 changed files with 1987 additions and 729 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main.cc
View file

@ -853,7 +853,7 @@ int main(int argc, char** argv)
if ( dns_type != DNS_PRIME )
net_init(interfaces, read_files, netflows, flow_files,
writefile, "tcp or udp or icmp",
writefile, "",
secondary_path->Filter(), do_watchdog);
BroFile::SetDefaultRotation(log_rotate_interval, log_max_size);