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

Merge remote-tracking branch 'origin/master' into topic/bernhard/input-allow_invalid_types

Browse source
This commit is contained in:
Bernhard Amann 2012-08-22 07:30:58 -07:00
commit 1498a3bd59
30 changed files with 274 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scripts/base/frameworks/logging/main.bro
View file

@ -329,9 +329,9 @@ export {
global run_rotation_postprocessor_cmd: function(info: RotationInfo, npath: string) : bool;
## The streams which are currently active and not disabled.
## This set is not meant to be modified by users! Only use it for
## This table is not meant to be modified by users! Only use it for
## examining which streams are active.
global active_streams: set[ID] = set();
global active_streams: table[ID] of Stream = table();
}
# We keep a script-level copy of all filters so that we can manipulate them.
@ -417,7 +417,7 @@ function create_stream(id: ID, stream: Stream) : bool
if ( ! __create_stream(id, stream) )
return F;
add active_streams[id];
active_streams[id] = stream;
return add_default_filter(id);
}