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

Final fixes, preparing for merge.

Browse source
This commit is contained in:
Robin Sommer 2014-07-31 10:49:50 -07:00
parent 2b505b07c1
commit aa731eeaec
6 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/CMakeLists.txt
View file

@ -153,16 +153,17 @@ list(APPEND BINPAC_OUTPUTS "${BINPAC_OUTPUT_CC}")
set(bro_SUBDIR_LIBS CACHE INTERNAL "subdir libraries" FORCE) set(bro_SUBDIR_LIBS CACHE INTERNAL "subdir libraries" FORCE)
set(bro_PLUGIN_LIBS CACHE INTERNAL "plugin libraries" FORCE) set(bro_PLUGIN_LIBS CACHE INTERNAL "plugin libraries" FORCE)
add_subdirectory(analyzer)
add_subdirectory(broxygen)
add_subdirectory(file_analysis)
add_subdirectory(input) add_subdirectory(input)
add_subdirectory(logging) add_subdirectory(logging)
add_subdirectory(analyzer)
add_subdirectory(file_analysis)
add_subdirectory(probabilistic) add_subdirectory(probabilistic)
add_subdirectory(broxygen)
set(bro_SUBDIRS set(bro_SUBDIRS
${bro_SUBDIR_LIBS} # Order is important here.
${bro_PLUGIN_LIBS} ${bro_PLUGIN_LIBS}
${bro_SUBDIR_LIBS}
) )
if ( NOT bro_HAVE_OBJECT_LIBRARIES ) if ( NOT bro_HAVE_OBJECT_LIBRARIES )

8
src/Val.cc
View file

@ -2920,15 +2920,7 @@ void EnumVal::ValDescribe(ODesc* d) const
const char* ename = type->AsEnumType()->Lookup(val.int_val); const char* ename = type->AsEnumType()->Lookup(val.int_val);
if ( ! ename ) if ( ! ename )
{
EnumType::enum_name_list l = type->AsEnumType()->Names();
for ( EnumType::enum_name_list::const_iterator iter = l.begin();
iter != l.end(); ++iter )
fprintf(stderr, "%s -> %lld\n", iter->first.c_str(), iter->second);
ename = "<undefined>"; ename = "<undefined>";
}
d->Add(ename); d->Add(ename);
} }

1
src/input/CMakeLists.txt
View file

@ -19,4 +19,5 @@ set(input_SRCS
bif_target(input.bif) bif_target(input.bif)
bro_add_subdir_library(input ${input_SRCS} ${BIF_OUTPUT_CC}) bro_add_subdir_library(input ${input_SRCS} ${BIF_OUTPUT_CC})
add_dependencies(bro_input generate_outputs)

1
src/logging/CMakeLists.txt
View file

@ -19,4 +19,5 @@ set(logging_SRCS
bif_target(logging.bif) bif_target(logging.bif)
bro_add_subdir_library(logging ${logging_SRCS} ${BIF_OUTPUT_CC}) bro_add_subdir_library(logging ${logging_SRCS} ${BIF_OUTPUT_CC})
add_dependencies(bro_logging generate_outputs)

7
src/logging/writers/dataseries/CMakeLists.txt
View file

@ -10,9 +10,16 @@ if (NOT DISABLE_DATASERIES AND
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
include_directories(BEFORE ${Lintel_INCLUDE_DIR})
include_directories(BEFORE ${DataSeries_INCLUDE_DIR})
include_directories(BEFORE ${LibXML2_INCLUDE_DIR})
bro_plugin_begin(Bro DataSeriesWriter) bro_plugin_begin(Bro DataSeriesWriter)
bro_plugin_cc(DataSeries.cc Plugin.cc) bro_plugin_cc(DataSeries.cc Plugin.cc)
bro_plugin_bif(dataseries.bif) bro_plugin_bif(dataseries.bif)
bro_plugin_link_library(${Lintel_LIBRARIES})
bro_plugin_link_library(${DataSeries_LIBRARIES})
bro_plugin_link_library(${LibXML2_LIBRARIES})
bro_plugin_end() bro_plugin_end()
endif() endif()

1
src/logging/writers/dataseries/DataSeries.h
View file

@ -12,6 +12,7 @@
#include <DataSeries/GeneralField.hpp> #include <DataSeries/GeneralField.hpp>
#include "logging/WriterBackend.h" #include "logging/WriterBackend.h"
#include "threading/formatters/Ascii.h"
namespace logging { namespace writer { namespace logging { namespace writer {