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

Merge remote-tracking branch 'origin/master' into topic/robin/dataseries

Browse source 
Conflicts:
	CMakeLists.txt
	cmake
This commit is contained in:
Robin Sommer 2012-04-17 16:37:37 -07:00
commit a7bc12066b
104 changed files with 1523 additions and 338 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/logging/Manager.cc
View file

@ -476,14 +476,13 @@ bool Manager::TraverseRecord(Stream* stream, Filter* filter, RecordType* rt,
threading::Field* field = new threading::Field();
field->name = new_path;
field->type = t->Tag();
if ( field->type == TYPE_TABLE )
{
field->subtype = t->AsSetType()->Indices()->PureType()->Tag();
}
field->subtype = t->AsSetType()->Indices()->PureType()->Tag();
else if ( field->type == TYPE_VECTOR )
{
field->subtype = t->AsVectorType()->YieldType()->Tag();
}
field->subtype = t->AsVectorType()->YieldType()->Tag();
filter->fields[filter->num_fields - 1] = field;
}