Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

DataSeries compilation issue fixed.

Browse source 
BIT-1121 #merged
This commit is contained in:
mlaterman 2014-06-26 13:49:24 -06:00 • committed by Robin Sommer
parent 83457b2974
commit 413871af79
3 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -1,4 +1,10 @@
2.3-6 | 2014-06-26 17:24:10 -0700
* DataSeries compilation issue fixed. (mlaterman)
* Fix a reference counting bug in ListVal ctor. (Jon Siwek)
2.3-3 | 2014-06-26 15:41:04 -0500 2.3-3 | 2014-06-26 15:41:04 -0500
* Support tilde expansion when Bro tries to find its own path. (Jon * Support tilde expansion when Bro tries to find its own path. (Jon

2
VERSION
View file

@ -1 +1 @@
2.3-3 2.3-6

16
src/logging/writers/DataSeries.cc
View file

@ -235,7 +235,7 @@ DataSeries::DataSeries(WriterFrontend* frontend) : WriterBackend(frontend)
threading::formatter::Ascii::SeparatorInfo sep_info; threading::formatter::Ascii::SeparatorInfo sep_info;
ascii = new threading::formatter::Ascii(this, sep_info); ascii = new threading::formatter::Ascii(this, sep_info);
compress_type = Extent::compress_none; compress_type = Extent::compress_mode_none;
log_file = 0; log_file = 0;
log_output = 0; log_output = 0;
} }
@ -343,25 +343,25 @@ bool DataSeries::DoInit(const WriterInfo& info, int num_fields, const threading:
compress_type = Extent::compress_all; compress_type = Extent::compress_all;
if( ds_compression == "lzf" ) if( ds_compression == "lzf" )
compress_type = Extent::compress_lzf; compress_type = Extent::compress_mode_lzf;
else if( ds_compression == "lzo" ) else if( ds_compression == "lzo" )
compress_type = Extent::compress_lzo; compress_type = Extent::compress_mode_lzo;
else if( ds_compression == "gz" ) else if( ds_compression == "zlib" )
compress_type = Extent::compress_gz; compress_type = Extent::compress_mode_zlib;
else if( ds_compression == "bz2" ) else if( ds_compression == "bz2" )
compress_type = Extent::compress_bz2; compress_type = Extent::compress_mode_bz2;
else if( ds_compression == "none" ) else if( ds_compression == "none" )
compress_type = Extent::compress_none; compress_type = Extent::compress_mode_none;
else if( ds_compression == "any" ) else if( ds_compression == "any" )
compress_type = Extent::compress_all; compress_type = Extent::compress_all;
else else
Warning(Fmt("%s is not a valid compression type. Valid types are: 'lzf', 'lzo', 'gz', 'bz2', 'none', 'any'. Defaulting to 'any'", ds_compression.c_str())); Warning(Fmt("%s is not a valid compression type. Valid types are: 'lzf', 'lzo', 'zlib', 'bz2', 'none', 'any'. Defaulting to 'any'", ds_compression.c_str()));
log_type = log_types.registerTypePtr(schema); log_type = log_types.registerTypePtr(schema);
log_series.setType(log_type); log_series.setType(log_type);