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

Merge branch 'master' of ssh://git.bro-ids.org/bro

Browse source 
Conflicts:
	scripts/base/frameworks/control/main.bro
This commit is contained in:
Seth Hall 2011-08-05 23:11:40 -04:00
commit d6a67f7c1f
17 changed files with 134 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/base/frameworks/cluster/setup-connections.bro
View file

@ -67,7 +67,7 @@ event bro_init() &priority=9
if ( n$node_type == PROXY && me$proxy == i )
Communication::nodes["proxy"] = [$host=nodes[i]$ip, $p=nodes[i]$p,
$connect=T, $retry=1mins,
$connect=T, $retry=1mins, $sync=T,
$class=node];
if ( n$node_type == TIME_MACHINE && me?$time_machine && me$time_machine == i )