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

Merge remote-tracking branch 'origin/master' into topic/johanna/remove-serializer

Browse source
This commit is contained in:
Johanna Amann 2019-06-17 09:50:05 -07:00
commit a50b06d6c1
543 changed files with 6954 additions and 6478 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/logging/writers/ascii/Ascii.cc
View file

@ -444,7 +444,8 @@ bool Ascii::DoHeartbeat(double network_time, double current_time)
string Ascii::LogExt()
{
const char* ext = getenv("BRO_LOG_SUFFIX");
const char* ext = zeekenv("ZEEK_LOG_SUFFIX");
if ( ! ext )
ext = "log";

10
src/logging/writers/ascii/CMakeLists.txt
View file

@ -1,9 +1,9 @@
include(BroPlugin)
include(ZeekPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(Bro AsciiWriter)
bro_plugin_cc(Ascii.cc Plugin.cc)
bro_plugin_bif(ascii.bif)
bro_plugin_end()
zeek_plugin_begin(Zeek AsciiWriter)
zeek_plugin_cc(Ascii.cc Plugin.cc)
zeek_plugin_bif(ascii.bif)
zeek_plugin_end()

4
src/logging/writers/ascii/Plugin.cc
View file

@ -6,7 +6,7 @@
#include "Ascii.h"
namespace plugin {
namespace Bro_AsciiWriter {
namespace Zeek_AsciiWriter {
class Plugin : public plugin::Plugin {
public:
@ -15,7 +15,7 @@ public:
AddComponent(new ::logging::Component("Ascii", ::logging::writer::Ascii::Instantiate));
plugin::Configuration config;
config.name = "Bro::AsciiWriter";
config.name = "Zeek::AsciiWriter";
config.description = "ASCII log writer";
return config;
}

10
src/logging/writers/none/CMakeLists.txt
View file

@ -1,9 +1,9 @@
include(BroPlugin)
include(ZeekPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(Bro NoneWriter)
bro_plugin_cc(None.cc Plugin.cc)
bro_plugin_bif(none.bif)
bro_plugin_end()
zeek_plugin_begin(Zeek NoneWriter)
zeek_plugin_cc(None.cc Plugin.cc)
zeek_plugin_bif(none.bif)
zeek_plugin_end()

4
src/logging/writers/none/Plugin.cc
View file

@ -6,7 +6,7 @@
#include "None.h"
namespace plugin {
namespace Bro_NoneWriter {
namespace Zeek_NoneWriter {
class Plugin : public plugin::Plugin {
public:
@ -15,7 +15,7 @@ public:
AddComponent(new ::logging::Component("None", ::logging::writer::None::Instantiate));
plugin::Configuration config;
config.name = "Bro::NoneWriter";
config.name = "Zeek::NoneWriter";
config.description = "None log writer (primarily for debugging)";
return config;
}

10
src/logging/writers/sqlite/CMakeLists.txt
View file

@ -1,9 +1,9 @@
include(BroPlugin)
include(ZeekPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(Bro SQLiteWriter)
bro_plugin_cc(SQLite.cc Plugin.cc)
bro_plugin_bif(sqlite.bif)
bro_plugin_end()
zeek_plugin_begin(Zeek SQLiteWriter)
zeek_plugin_cc(SQLite.cc Plugin.cc)
zeek_plugin_bif(sqlite.bif)
zeek_plugin_end()

4
src/logging/writers/sqlite/Plugin.cc
View file

@ -6,7 +6,7 @@
#include "SQLite.h"
namespace plugin {
namespace Bro_SQLiteWriter {
namespace Zeek_SQLiteWriter {
class Plugin : public plugin::Plugin {
public:
@ -15,7 +15,7 @@ public:
AddComponent(new ::logging::Component("SQLite", ::logging::writer::SQLite::Instantiate));
plugin::Configuration config;
config.name = "Bro::SQLiteWriter";
config.name = "Zeek::SQLiteWriter";
config.description = "SQLite log writer";
return config;
}