diff --git a/CHANGES b/CHANGES index 00829c6d39..c59e881e1a 100644 --- a/CHANGES +++ b/CHANGES @@ -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 * Support tilde expansion when Bro tries to find its own path. (Jon diff --git a/VERSION b/VERSION index 2fdbb31cca..ec69c578de 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.3-3 +2.3-6 diff --git a/src/logging/writers/DataSeries.cc b/src/logging/writers/DataSeries.cc index 71a6428950..2c14a51e25 100644 --- a/src/logging/writers/DataSeries.cc +++ b/src/logging/writers/DataSeries.cc @@ -235,7 +235,7 @@ DataSeries::DataSeries(WriterFrontend* frontend) : WriterBackend(frontend) threading::formatter::Ascii::SeparatorInfo 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_output = 0; } @@ -343,25 +343,25 @@ bool DataSeries::DoInit(const WriterInfo& info, int num_fields, const threading: compress_type = Extent::compress_all; if( ds_compression == "lzf" ) - compress_type = Extent::compress_lzf; + compress_type = Extent::compress_mode_lzf; else if( ds_compression == "lzo" ) - compress_type = Extent::compress_lzo; + compress_type = Extent::compress_mode_lzo; - else if( ds_compression == "gz" ) - compress_type = Extent::compress_gz; + else if( ds_compression == "zlib" ) + compress_type = Extent::compress_mode_zlib; else if( ds_compression == "bz2" ) - compress_type = Extent::compress_bz2; + compress_type = Extent::compress_mode_bz2; else if( ds_compression == "none" ) - compress_type = Extent::compress_none; + compress_type = Extent::compress_mode_none; else if( ds_compression == "any" ) compress_type = Extent::compress_all; 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_series.setType(log_type);