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-tracking branch 'origin/master' into topic/seth/notice-suppression

Browse source
This commit is contained in:
Seth Hall 2011-09-15 00:27:57 -04:00
commit 8006f26db2
22 changed files with 164 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scripts/base/frameworks/cluster/main.bro
View file

@ -86,15 +86,15 @@ function local_node_type(): NodeType
return is_enabled() ? nodes[node]$node_type : NONE;
}
event remote_connection_handshake_done(p: event_peer)
event remote_connection_handshake_done(p: event_peer) &priority=5
{
if ( nodes[p$descr]$node_type == WORKER )
if ( p$descr in nodes && nodes[p$descr]$node_type == WORKER )
++worker_count;
}
event remote_connection_closed(p: event_peer)
event remote_connection_closed(p: event_peer) &priority=5
{
if ( nodes[p$descr]$node_type == WORKER )
if ( p$descr in nodes && nodes[p$descr]$node_type == WORKER )
--worker_count;
}

3
scripts/base/frameworks/dpd/main.bro
View file

@ -25,8 +25,7 @@ export {
## Disabled analyzer IDs. This is only for internal tracking
## so as to not attempt to disable analyzers multiple times.
# TODO: This is waiting on ticket #460 to remove the '0'.
disabled_aids: set[count] &default=set(0);
disabled_aids: set[count] &default=set();
};
## Ignore violations which go this many bytes into the connection.