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

Fixing cmake dependencies and "make {install,clean}"

Browse source 
Also includes a bunch of cleanup.
This commit is contained in:
Robin Sommer 2013-05-15 20:22:51 -07:00
parent 10dc8b9279
commit 8752870967
86 changed files with 130 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cmake

@ -1 +1 @@
Subproject commit c50757259f509f13227cf28bbd4fd281828a39d2 Subproject commit 0034421286f23a3d7ab2044d658c3ac72797569b

34
src/CMakeLists.txt
View file

@ -3,6 +3,9 @@ include_directories(BEFORE
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
) )
# This collects generated bif and pac files from subdirectories.
set(bro_ALL_GENERATED_OUTPUTS CACHE INTERNAL "automatically generated files" FORCE)
configure_file(version.c.in ${CMAKE_CURRENT_BINARY_DIR}/version.c) configure_file(version.c.in ${CMAKE_CURRENT_BINARY_DIR}/version.c)
configure_file(util-config.h.in ${CMAKE_CURRENT_BINARY_DIR}/util-config.h) configure_file(util-config.h.in ${CMAKE_CURRENT_BINARY_DIR}/util-config.h)
@ -114,11 +117,9 @@ set(BIF_SRCS
) )
foreach (bift ${BIF_SRCS}) foreach (bift ${BIF_SRCS})
bif_target(${bift}) bif_target(${bift} "standard")
endforeach () endforeach ()
add_custom_target(generate_bifs DEPENDS ${ALL_BIF_OUTPUTS})
######################################################################## ########################################################################
## BinPAC-dependent targets ## BinPAC-dependent targets
@ -131,7 +132,10 @@ set(BINPAC_AUXSRC
) )
binpac_target(binpac-lib.pac) binpac_target(binpac-lib.pac)
list(APPEND BINPAC_OUTPUTS "${BINPAC_OUTPUT_CC}")
binpac_target(binpac_bro-lib.pac) binpac_target(binpac_bro-lib.pac)
list(APPEND BINPAC_OUTPUTS "${BINPAC_OUTPUT_CC}")
######################################################################## ########################################################################
## Including subdirectories. ## Including subdirectories.
@ -156,7 +160,7 @@ find_package (Threads)
macro(COLLECT_HEADERS _var) macro(COLLECT_HEADERS _var)
foreach (src ${ARGN}) foreach (src ${ARGN})
get_filename_component(ext ${src} EXT) get_filename_component(ext ${src} EXT)
if (${ext} STREQUAL ".cc" OR ${ext} STREQUAL ".c") if ("${ext}" STREQUAL ".cc" OR "${ext}" STREQUAL ".c")
get_filename_component(base ${src} NAME_WE) get_filename_component(base ${src} NAME_WE)
get_filename_component(dir ${src} PATH) get_filename_component(dir ${src} PATH)
if (NOT "${dir}") if (NOT "${dir}")
@ -189,10 +193,8 @@ set_source_files_properties(nb_dns.c PROPERTIES COMPILE_FLAGS
set(bro_SRCS set(bro_SRCS
${CMAKE_CURRENT_BINARY_DIR}/version.c ${CMAKE_CURRENT_BINARY_DIR}/version.c
${BIF_SRCS} ${BIF_SRCS}
${ALL_BIF_OUTPUTS}
${BINPAC_AUXSRC} ${BINPAC_AUXSRC}
${ALL_BINPAC_INPUTS} ${BINPAC_OUTPUTS}
${ALL_BINPAC_OUTPUTS}
${TRANSFORMED_BISON_OUTPUTS} ${TRANSFORMED_BISON_OUTPUTS}
${FLEX_RuleScanner_OUTPUTS} ${FLEX_RuleScanner_OUTPUTS}
${FLEX_RuleScanner_INPUT} ${FLEX_RuleScanner_INPUT}
@ -333,12 +335,20 @@ add_executable(bro ${bro_SRCS} ${bro_HEADERS} ${bro_SUBDIRS})
target_link_libraries(bro ${brodeps} ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(bro ${brodeps} ${CMAKE_THREAD_LIBS_INIT})
install(TARGETS bro DESTINATION bin) install(TARGETS bro DESTINATION bin)
install(FILES ${INSTALL_BIF_OUTPUTS} DESTINATION ${BRO_SCRIPT_INSTALL_PATH}/base)
set(BRO_EXE bro set(BRO_EXE bro
CACHE STRING "Bro executable binary" FORCE) CACHE STRING "Bro executable binary" FORCE)
include(BroPlugin) add_custom_target(generate_outputs DEPENDS ${bro_ALL_GENERATED_OUTPUTS})
bro_plugin_bif_create_loader(bif_loader ${CMAKE_BINARY_DIR}/scripts/base/bif/plugins)
add_dependencies(bif_loader ${bro_SUBDIRS}) # Build __load__.bro files for plugins/*.bif.bro.
add_dependencies(bro bif_loader) bro_bif_create_loader(bif_loader_plugins ${CMAKE_BINARY_DIR}/scripts/base/bif/plugins)
add_dependencies(bif_loader_plugins ${bro_SUBDIRS})
add_dependencies(bro bif_loader_plugins)
# Install *.bif.bro.
install(DIRECTORY ${CMAKE_BINARY_DIR}/scripts/base/bif DESTINATION ${BRO_SCRIPT_INSTALL_PATH}/base)
# Make clean removes the bif directory.
set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_BINARY_DIR}/scripts/base/bif)

2
src/FlowSrc.cc
View file

@ -9,7 +9,7 @@
#include "FlowSrc.h" #include "FlowSrc.h"
#include "Net.h" #include "Net.h"
#include "netflow_pac.h" #include "analyzer/protocol/netflow/netflow_pac.h"
#include <errno.h> #include <errno.h>
FlowSrc::FlowSrc() FlowSrc::FlowSrc()

10
src/analyzer/CMakeLists.txt
View file

@ -13,10 +13,6 @@ set(analyzer_SRCS
Tag.cc Tag.cc
) )
bif_target_for_subdir(analyzer.bif) bif_target(analyzer.bif)
add_library(bro_analyzer OBJECT ${analyzer_SRCS} ${BIF_OUTPUT_CC})
bro_plugin_dependencies(DCE_RPC generate_analyzer.bif) add_dependencies(bro_analyzer generate_outputs)
add_library(bro_analyzer OBJECT ${analyzer_SRCS} ${BIF_OUTPUT_CC} ${BIF_OUTPUT_H})
add_dependencies(bro_analyzer generate_events.bif)

18
src/analyzer/Manager.cc
View file

@ -4,18 +4,18 @@
#include "Hash.h" #include "Hash.h"
#include "Val.h" #include "Val.h"
#include "analyzer/protocol/backdoor/BackDoor.h" #include "protocol/backdoor/BackDoor.h"
#include "analyzer/protocol/conn-size/ConnSize.h" #include "protocol/conn-size/ConnSize.h"
#include "analyzer/protocol/icmp/ICMP.h" #include "protocol/icmp/ICMP.h"
#include "analyzer/protocol/interconn/InterConn.h" #include "protocol/interconn/InterConn.h"
#include "analyzer/protocol/pia/PIA.h" #include "protocol/pia/PIA.h"
#include "analyzer/protocol/stepping-stone/SteppingStone.h" #include "protocol/stepping-stone/SteppingStone.h"
#include "analyzer/protocol/tcp/TCP.h" #include "protocol/tcp/TCP.h"
#include "analyzer/protocol/udp/UDP.h" #include "protocol/udp/UDP.h"
#include "plugin/Manager.h" #include "plugin/Manager.h"
#include "protocols/tcp/events.bif.h" #include "protocol/tcp/events.bif.h"
using namespace analyzer; using namespace analyzer;

2
src/analyzer/protocol/arp/CMakeLists.txt
View file

@ -8,7 +8,7 @@ include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(ARP) bro_plugin_begin(Bro ARP)
bro_plugin_cc(ARP.cc Plugin.cc) bro_plugin_cc(ARP.cc Plugin.cc)
bro_plugin_bif(events.bif) bro_plugin_bif(events.bif)
bro_plugin_end() bro_plugin_end()

2
src/analyzer/protocol/arp/Plugin.cc
View file

@ -1,7 +1,7 @@
#include "plugin/Plugin.h" #include "plugin/Plugin.h"
BRO_PLUGIN_BEGIN(ARP) BRO_PLUGIN_BEGIN(Bro, ARP)
BRO_PLUGIN_DESCRIPTION("ARP Parsing Code"); BRO_PLUGIN_DESCRIPTION("ARP Parsing Code");
BRO_PLUGIN_BIF_FILE(events); BRO_PLUGIN_BIF_FILE(events);
BRO_PLUGIN_END BRO_PLUGIN_END

2
src/analyzer/protocol/ayiya/CMakeLists.txt
View file

@ -3,7 +3,7 @@ include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(AYIYA) bro_plugin_begin(Bro AYIYA)
bro_plugin_cc(AYIYA.cc Plugin.cc) bro_plugin_cc(AYIYA.cc Plugin.cc)
bro_plugin_bif(events.bif) bro_plugin_bif(events.bif)
bro_plugin_pac(ayiya.pac ayiya-protocol.pac ayiya-analyzer.pac) bro_plugin_pac(ayiya.pac ayiya-protocol.pac ayiya-analyzer.pac)

2
src/analyzer/protocol/ayiya/Plugin.cc
View file

@ -3,7 +3,7 @@
#include "AYIYA.h" #include "AYIYA.h"
BRO_PLUGIN_BEGIN(AYIYA) BRO_PLUGIN_BEGIN(Bro, AYIYA)
BRO_PLUGIN_DESCRIPTION("AYIYA Analyzer"); BRO_PLUGIN_DESCRIPTION("AYIYA Analyzer");
BRO_PLUGIN_ANALYZER("AYIYA", ayiya::AYIYA_Analyzer); BRO_PLUGIN_ANALYZER("AYIYA", ayiya::AYIYA_Analyzer);
BRO_PLUGIN_BIF_FILE(events); BRO_PLUGIN_BIF_FILE(events);

2
src/analyzer/protocol/backdoor/CMakeLists.txt
View file

@ -3,7 +3,7 @@ include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(BackDoor) bro_plugin_begin(Bro BackDoor)
bro_plugin_cc(BackDoor.cc Plugin.cc) bro_plugin_cc(BackDoor.cc Plugin.cc)
bro_plugin_bif(events.bif) bro_plugin_bif(events.bif)
bro_plugin_end() bro_plugin_end()

2
src/analyzer/protocol/backdoor/Plugin.cc
View file

@ -3,7 +3,7 @@
#include "BackDoor.h" #include "BackDoor.h"
BRO_PLUGIN_BEGIN(BackDoor) BRO_PLUGIN_BEGIN(Bro, BackDoor)
BRO_PLUGIN_DESCRIPTION("Backdoor Analyzer (deprecated)"); BRO_PLUGIN_DESCRIPTION("Backdoor Analyzer (deprecated)");
BRO_PLUGIN_ANALYZER("BackDoor", backdoor::BackDoor_Analyzer); BRO_PLUGIN_ANALYZER("BackDoor", backdoor::BackDoor_Analyzer);
BRO_PLUGIN_BIF_FILE(events); BRO_PLUGIN_BIF_FILE(events);

2
src/analyzer/protocol/bittorrent/CMakeLists.txt
View file

@ -3,7 +3,7 @@ include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(BitTorrent) bro_plugin_begin(Bro BitTorrent)
bro_plugin_cc(BitTorrent.cc BitTorrentTracker.cc Plugin.cc) bro_plugin_cc(BitTorrent.cc BitTorrentTracker.cc Plugin.cc)
bro_plugin_bif(events.bif) bro_plugin_bif(events.bif)
bro_plugin_pac(bittorrent.pac bittorrent-analyzer.pac bittorrent-protocol.pac) bro_plugin_pac(bittorrent.pac bittorrent-analyzer.pac bittorrent-protocol.pac)

2
src/analyzer/protocol/bittorrent/Plugin.cc
View file

@ -4,7 +4,7 @@
#include "BitTorrent.h" #include "BitTorrent.h"
#include "BitTorrentTracker.h" #include "BitTorrentTracker.h"
BRO_PLUGIN_BEGIN(BitTorrent) BRO_PLUGIN_BEGIN(Bro, BitTorrent)
BRO_PLUGIN_DESCRIPTION("BitTorrent Analyzer"); BRO_PLUGIN_DESCRIPTION("BitTorrent Analyzer");
BRO_PLUGIN_ANALYZER("BitTorrent", bittorrent::BitTorrent_Analyzer); BRO_PLUGIN_ANALYZER("BitTorrent", bittorrent::BitTorrent_Analyzer);
BRO_PLUGIN_ANALYZER("BitTorrentTracker", bittorrent::BitTorrent_Analyzer); BRO_PLUGIN_ANALYZER("BitTorrentTracker", bittorrent::BitTorrent_Analyzer);

2
src/analyzer/protocol/conn-size/CMakeLists.txt
View file

@ -3,7 +3,7 @@ include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(ConnSize) bro_plugin_begin(Bro ConnSize)
bro_plugin_cc(ConnSize.cc Plugin.cc) bro_plugin_cc(ConnSize.cc Plugin.cc)
bro_plugin_bif(events.bif) bro_plugin_bif(events.bif)
bro_plugin_end() bro_plugin_end()

2
src/analyzer/protocol/conn-size/Plugin.cc
View file

@ -3,7 +3,7 @@
#include "ConnSize.h" #include "ConnSize.h"
BRO_PLUGIN_BEGIN(ConnSize) BRO_PLUGIN_BEGIN(Bro, ConnSize)
BRO_PLUGIN_DESCRIPTION("Connection size analyzer"); BRO_PLUGIN_DESCRIPTION("Connection size analyzer");
BRO_PLUGIN_ANALYZER("ConnSize", conn_size::ConnSize_Analyzer); BRO_PLUGIN_ANALYZER("ConnSize", conn_size::ConnSize_Analyzer);
BRO_PLUGIN_BIF_FILE(events); BRO_PLUGIN_BIF_FILE(events);

3
src/analyzer/protocol/dce-rpc/CMakeLists.txt
View file

@ -3,9 +3,10 @@ include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(DCE_RPC) bro_plugin_begin(Bro DCE_RPC)
bro_plugin_cc(DCE_RPC.cc Plugin.cc) bro_plugin_cc(DCE_RPC.cc Plugin.cc)
bro_plugin_bif(events.bif) bro_plugin_bif(events.bif)
bro_plugin_pac(dce_rpc.pac dce_rpc-protocol.pac dce_rpc-analyzer.pac) bro_plugin_pac(dce_rpc.pac dce_rpc-protocol.pac dce_rpc-analyzer.pac)
bro_plugin_pac(dce_rpc_simple.pac dce_rpc-protocol.pac epmapper.pac) bro_plugin_pac(dce_rpc_simple.pac dce_rpc-protocol.pac epmapper.pac)
bro_plugin_end() bro_plugin_end()

2
src/analyzer/protocol/dce-rpc/Plugin.cc
View file

@ -3,7 +3,7 @@
#include "DCE_RPC.h" #include "DCE_RPC.h"
BRO_PLUGIN_BEGIN(DCE_RPC) BRO_PLUGIN_BEGIN(Bro, DCE_RPC)
BRO_PLUGIN_DESCRIPTION("DCE-RPC analyzer"); BRO_PLUGIN_DESCRIPTION("DCE-RPC analyzer");
BRO_PLUGIN_ANALYZER("DCE_RPC", dce_rpc::DCE_RPC_Analyzer); BRO_PLUGIN_ANALYZER("DCE_RPC", dce_rpc::DCE_RPC_Analyzer);
BRO_PLUGIN_SUPPORT_ANALYZER("Contents_DCE_RPC"); BRO_PLUGIN_SUPPORT_ANALYZER("Contents_DCE_RPC");

2
src/analyzer/protocol/dhcp/CMakeLists.txt
View file

@ -3,7 +3,7 @@ include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(DHCP) bro_plugin_begin(Bro DHCP)
bro_plugin_cc(DHCP.cc Plugin.cc) bro_plugin_cc(DHCP.cc Plugin.cc)
bro_plugin_bif(events.bif) bro_plugin_bif(events.bif)
bro_plugin_pac(dhcp.pac dhcp-protocol.pac dhcp-analyzer.pac) bro_plugin_pac(dhcp.pac dhcp-protocol.pac dhcp-analyzer.pac)

2
src/analyzer/protocol/dhcp/Plugin.cc
View file

@ -3,7 +3,7 @@
#include "DHCP.h" #include "DHCP.h"
BRO_PLUGIN_BEGIN(DHCP) BRO_PLUGIN_BEGIN(Bro, DHCP)
BRO_PLUGIN_DESCRIPTION("DHCP analyzer"); BRO_PLUGIN_DESCRIPTION("DHCP analyzer");
BRO_PLUGIN_ANALYZER("DHCP", dhcp::DHCP_Analyzer); BRO_PLUGIN_ANALYZER("DHCP", dhcp::DHCP_Analyzer);
BRO_PLUGIN_BIF_FILE(events); BRO_PLUGIN_BIF_FILE(events);

2
src/analyzer/protocol/dns/CMakeLists.txt
View file

@ -3,7 +3,7 @@ include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(DNS) bro_plugin_begin(Bro DNS)
bro_plugin_cc(DNS.cc Plugin.cc) bro_plugin_cc(DNS.cc Plugin.cc)
bro_plugin_bif(events.bif) bro_plugin_bif(events.bif)
bro_plugin_end() bro_plugin_end()

2
src/analyzer/protocol/dns/Plugin.cc
View file

@ -3,7 +3,7 @@
#include "DNS.h" #include "DNS.h"
BRO_PLUGIN_BEGIN(DNS) BRO_PLUGIN_BEGIN(Bro, DNS)
BRO_PLUGIN_DESCRIPTION("DNS analyzer"); BRO_PLUGIN_DESCRIPTION("DNS analyzer");
BRO_PLUGIN_ANALYZER("DNS", dns::DNS_Analyzer); BRO_PLUGIN_ANALYZER("DNS", dns::DNS_Analyzer);
BRO_PLUGIN_SUPPORT_ANALYZER("Contents_DNS"); BRO_PLUGIN_SUPPORT_ANALYZER("Contents_DNS");

2
src/analyzer/protocol/file/CMakeLists.txt
View file

@ -3,7 +3,7 @@ include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(File) bro_plugin_begin(Bro File)
bro_plugin_cc(File.cc Plugin.cc) bro_plugin_cc(File.cc Plugin.cc)
bro_plugin_bif(events.bif) bro_plugin_bif(events.bif)
bro_plugin_end() bro_plugin_end()

2
src/analyzer/protocol/file/Plugin.cc
View file

@ -3,7 +3,7 @@
#include "./File.h" #include "./File.h"
BRO_PLUGIN_BEGIN(File) BRO_PLUGIN_BEGIN(Bro, File)
BRO_PLUGIN_DESCRIPTION("Generic file analyzer"); BRO_PLUGIN_DESCRIPTION("Generic file analyzer");
BRO_PLUGIN_ANALYZER("File", file::File_Analyzer); BRO_PLUGIN_ANALYZER("File", file::File_Analyzer);
BRO_PLUGIN_BIF_FILE(events); BRO_PLUGIN_BIF_FILE(events);

2
src/analyzer/protocol/finger/CMakeLists.txt
View file

@ -3,7 +3,7 @@ include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(Finger) bro_plugin_begin(Bro Finger)
bro_plugin_cc(Finger.cc Plugin.cc) bro_plugin_cc(Finger.cc Plugin.cc)
bro_plugin_bif(events.bif) bro_plugin_bif(events.bif)
bro_plugin_end() bro_plugin_end()

2
src/analyzer/protocol/finger/Plugin.cc
View file

@ -3,7 +3,7 @@
#include "Finger.h" #include "Finger.h"
BRO_PLUGIN_BEGIN(Finger) BRO_PLUGIN_BEGIN(Bro, Finger)
BRO_PLUGIN_DESCRIPTION("Finger analyzer"); BRO_PLUGIN_DESCRIPTION("Finger analyzer");
BRO_PLUGIN_ANALYZER("Finger", finger::Finger_Analyzer); BRO_PLUGIN_ANALYZER("Finger", finger::Finger_Analyzer);
BRO_PLUGIN_BIF_FILE(events); BRO_PLUGIN_BIF_FILE(events);

2
src/analyzer/protocol/ftp/CMakeLists.txt
View file

@ -3,7 +3,7 @@ include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(FTP) bro_plugin_begin(Bro FTP)
bro_plugin_cc(FTP.cc Plugin.cc) bro_plugin_cc(FTP.cc Plugin.cc)
bro_plugin_bif(events.bif) bro_plugin_bif(events.bif)
bro_plugin_bif(functions.bif) bro_plugin_bif(functions.bif)

2
src/analyzer/protocol/ftp/Plugin.cc
View file

@ -3,7 +3,7 @@
#include "FTP.h" #include "FTP.h"
BRO_PLUGIN_BEGIN(FTP) BRO_PLUGIN_BEGIN(Bro, FTP)
BRO_PLUGIN_DESCRIPTION("FTP analyzer"); BRO_PLUGIN_DESCRIPTION("FTP analyzer");
BRO_PLUGIN_ANALYZER("FTP", ftp::FTP_Analyzer); BRO_PLUGIN_ANALYZER("FTP", ftp::FTP_Analyzer);
BRO_PLUGIN_SUPPORT_ANALYZER("FTP_ADAT"); BRO_PLUGIN_SUPPORT_ANALYZER("FTP_ADAT");

2
src/analyzer/protocol/gnutella/CMakeLists.txt
View file

@ -3,7 +3,7 @@ include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(Gnutella) bro_plugin_begin(Bro Gnutella)
bro_plugin_cc(Gnutella.cc Plugin.cc) bro_plugin_cc(Gnutella.cc Plugin.cc)
bro_plugin_bif(events.bif) bro_plugin_bif(events.bif)
bro_plugin_end() bro_plugin_end()

2
src/analyzer/protocol/gnutella/Plugin.cc
View file

@ -3,7 +3,7 @@
#include "Gnutella.h" #include "Gnutella.h"
BRO_PLUGIN_BEGIN(Gnutella) BRO_PLUGIN_BEGIN(Bro, Gnutella)
BRO_PLUGIN_DESCRIPTION("Gnutella analyzer"); BRO_PLUGIN_DESCRIPTION("Gnutella analyzer");
BRO_PLUGIN_ANALYZER("Gnutella", gnutella::Gnutella_Analyzer); BRO_PLUGIN_ANALYZER("Gnutella", gnutella::Gnutella_Analyzer);
BRO_PLUGIN_BIF_FILE(events); BRO_PLUGIN_BIF_FILE(events);

2
src/analyzer/protocol/gtpv1/CMakeLists.txt
View file

@ -3,7 +3,7 @@ include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(GTPv1) bro_plugin_begin(Bro GTPv1)
bro_plugin_cc(GTPv1.cc Plugin.cc) bro_plugin_cc(GTPv1.cc Plugin.cc)
bro_plugin_bif(events.bif) bro_plugin_bif(events.bif)
bro_plugin_pac(gtpv1.pac gtpv1-protocol.pac gtpv1-analyzer.pac) bro_plugin_pac(gtpv1.pac gtpv1-protocol.pac gtpv1-analyzer.pac)

2
src/analyzer/protocol/gtpv1/Plugin.cc
View file

@ -3,7 +3,7 @@
#include "GTPv1.h" #include "GTPv1.h"
BRO_PLUGIN_BEGIN(GTPv1) BRO_PLUGIN_BEGIN(Bro, GTPv1)
BRO_PLUGIN_DESCRIPTION("GTPv1 analyzer"); BRO_PLUGIN_DESCRIPTION("GTPv1 analyzer");
BRO_PLUGIN_ANALYZER("GTPv1", gtpv1::GTPv1_Analyzer); BRO_PLUGIN_ANALYZER("GTPv1", gtpv1::GTPv1_Analyzer);
BRO_PLUGIN_BIF_FILE(events); BRO_PLUGIN_BIF_FILE(events);

2
src/analyzer/protocol/http/CMakeLists.txt
View file

@ -3,7 +3,7 @@ include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(HTTP) bro_plugin_begin(Bro HTTP)
bro_plugin_cc(HTTP.cc Plugin.cc) bro_plugin_cc(HTTP.cc Plugin.cc)
bro_plugin_bif(events.bif) bro_plugin_bif(events.bif)
bro_plugin_bif(functions.bif) bro_plugin_bif(functions.bif)

2
src/analyzer/protocol/http/Plugin.cc
View file

@ -3,7 +3,7 @@
#include "HTTP.h" #include "HTTP.h"
BRO_PLUGIN_BEGIN(HTTP) BRO_PLUGIN_BEGIN(Bro, HTTP)
BRO_PLUGIN_DESCRIPTION("HTTP analyzer"); BRO_PLUGIN_DESCRIPTION("HTTP analyzer");
BRO_PLUGIN_ANALYZER("HTTP", http::HTTP_Analyzer); BRO_PLUGIN_ANALYZER("HTTP", http::HTTP_Analyzer);
BRO_PLUGIN_BIF_FILE(events); BRO_PLUGIN_BIF_FILE(events);

2
src/analyzer/protocol/icmp/CMakeLists.txt
View file

@ -3,7 +3,7 @@ include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(ICMP) bro_plugin_begin(Bro ICMP)
bro_plugin_cc(ICMP.cc Plugin.cc) bro_plugin_cc(ICMP.cc Plugin.cc)
bro_plugin_bif(events.bif) bro_plugin_bif(events.bif)
bro_plugin_end() bro_plugin_end()

2
src/analyzer/protocol/icmp/Plugin.cc
View file

@ -3,7 +3,7 @@
#include "ICMP.h" #include "ICMP.h"
BRO_PLUGIN_BEGIN(ICMP) BRO_PLUGIN_BEGIN(Bro, ICMP)
BRO_PLUGIN_DESCRIPTION("ICMP analyzer"); BRO_PLUGIN_DESCRIPTION("ICMP analyzer");
BRO_PLUGIN_ANALYZER("ICMP", icmp::ICMP_Analyzer); BRO_PLUGIN_ANALYZER("ICMP", icmp::ICMP_Analyzer);
BRO_PLUGIN_BIF_FILE(events); BRO_PLUGIN_BIF_FILE(events);

2
src/analyzer/protocol/ident/CMakeLists.txt
View file

@ -3,7 +3,7 @@ include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(Ident) bro_plugin_begin(Bro Ident)
bro_plugin_cc(Ident.cc Plugin.cc) bro_plugin_cc(Ident.cc Plugin.cc)
bro_plugin_bif(events.bif) bro_plugin_bif(events.bif)
bro_plugin_end() bro_plugin_end()

2
src/analyzer/protocol/ident/Plugin.cc
View file

@ -3,7 +3,7 @@
#include "Ident.h" #include "Ident.h"
BRO_PLUGIN_BEGIN(Ident) BRO_PLUGIN_BEGIN(Bro, Ident)
BRO_PLUGIN_DESCRIPTION("Ident analyzer"); BRO_PLUGIN_DESCRIPTION("Ident analyzer");
BRO_PLUGIN_ANALYZER("Ident", ident::Ident_Analyzer); BRO_PLUGIN_ANALYZER("Ident", ident::Ident_Analyzer);
BRO_PLUGIN_BIF_FILE(events); BRO_PLUGIN_BIF_FILE(events);

2
src/analyzer/protocol/interconn/CMakeLists.txt
View file

@ -3,7 +3,7 @@ include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(InterConn) bro_plugin_begin(Bro InterConn)
bro_plugin_cc(InterConn.cc Plugin.cc) bro_plugin_cc(InterConn.cc Plugin.cc)
bro_plugin_bif(events.bif) bro_plugin_bif(events.bif)
bro_plugin_end() bro_plugin_end()

2
src/analyzer/protocol/interconn/Plugin.cc
View file

@ -3,7 +3,7 @@
#include "InterConn.h" #include "InterConn.h"
BRO_PLUGIN_BEGIN(InterConn) BRO_PLUGIN_BEGIN(Bro, InterConn)
BRO_PLUGIN_DESCRIPTION("InterConn analyzer (deprecated)"); BRO_PLUGIN_DESCRIPTION("InterConn analyzer (deprecated)");
BRO_PLUGIN_ANALYZER("InterConn", interconn::InterConn_Analyzer); BRO_PLUGIN_ANALYZER("InterConn", interconn::InterConn_Analyzer);
BRO_PLUGIN_BIF_FILE(events); BRO_PLUGIN_BIF_FILE(events);

2
src/analyzer/protocol/irc/CMakeLists.txt
View file

@ -3,7 +3,7 @@ include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(IRC) bro_plugin_begin(Bro IRC)
bro_plugin_cc(IRC.cc Plugin.cc) bro_plugin_cc(IRC.cc Plugin.cc)
bro_plugin_bif(events.bif) bro_plugin_bif(events.bif)
bro_plugin_end() bro_plugin_end()

2
src/analyzer/protocol/irc/Plugin.cc
View file

@ -3,7 +3,7 @@
#include "IRC.h" #include "IRC.h"
BRO_PLUGIN_BEGIN(IRC) BRO_PLUGIN_BEGIN(Bro, IRC)
BRO_PLUGIN_DESCRIPTION("IRC analyzer"); BRO_PLUGIN_DESCRIPTION("IRC analyzer");
BRO_PLUGIN_ANALYZER("IRC", irc::IRC_Analyzer); BRO_PLUGIN_ANALYZER("IRC", irc::IRC_Analyzer);
BRO_PLUGIN_BIF_FILE(events); BRO_PLUGIN_BIF_FILE(events);

2
src/analyzer/protocol/login/CMakeLists.txt
View file

@ -3,7 +3,7 @@ include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(Login) bro_plugin_begin(Bro Login)
bro_plugin_cc(Login.cc RSH.cc Telnet.cc Rlogin.cc NVT.cc Plugin.cc) bro_plugin_cc(Login.cc RSH.cc Telnet.cc Rlogin.cc NVT.cc Plugin.cc)
bro_plugin_bif(events.bif) bro_plugin_bif(events.bif)
bro_plugin_bif(functions.bif) bro_plugin_bif(functions.bif)

2
src/analyzer/protocol/login/Plugin.cc
View file

@ -6,7 +6,7 @@
#include "RSH.h" #include "RSH.h"
#include "Rlogin.h" #include "Rlogin.h"
BRO_PLUGIN_BEGIN(Login) BRO_PLUGIN_BEGIN(Bro, Login)
BRO_PLUGIN_DESCRIPTION("Telnet/Rsh/Rlogin analyzers"); BRO_PLUGIN_DESCRIPTION("Telnet/Rsh/Rlogin analyzers");
BRO_PLUGIN_ANALYZER("Telnet", login::Telnet_Analyzer); BRO_PLUGIN_ANALYZER("Telnet", login::Telnet_Analyzer);
BRO_PLUGIN_ANALYZER("Rsh", login::Rsh_Analyzer); BRO_PLUGIN_ANALYZER("Rsh", login::Rsh_Analyzer);

2
src/analyzer/protocol/mime/CMakeLists.txt
View file

@ -8,7 +8,7 @@ include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(MIME) bro_plugin_begin(Bro MIME)
bro_plugin_cc(MIME.cc Plugin.cc) bro_plugin_cc(MIME.cc Plugin.cc)
bro_plugin_bif(events.bif) bro_plugin_bif(events.bif)
bro_plugin_end() bro_plugin_end()

2
src/analyzer/protocol/mime/Plugin.cc
View file

@ -1,7 +1,7 @@
#include "plugin/Plugin.h" #include "plugin/Plugin.h"
BRO_PLUGIN_BEGIN(MIME) BRO_PLUGIN_BEGIN(Bro, MIME)
BRO_PLUGIN_DESCRIPTION("MIME parsing code"); BRO_PLUGIN_DESCRIPTION("MIME parsing code");
BRO_PLUGIN_BIF_FILE(events); BRO_PLUGIN_BIF_FILE(events);
BRO_PLUGIN_END BRO_PLUGIN_END

2
src/analyzer/protocol/modbus/CMakeLists.txt
View file

@ -3,7 +3,7 @@ include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(Modbus) bro_plugin_begin(Bro Modbus)
bro_plugin_cc(Modbus.cc Plugin.cc) bro_plugin_cc(Modbus.cc Plugin.cc)
bro_plugin_bif(events.bif) bro_plugin_bif(events.bif)
bro_plugin_pac(modbus.pac modbus-analyzer.pac modbus-protocol.pac) bro_plugin_pac(modbus.pac modbus-analyzer.pac modbus-protocol.pac)

2
src/analyzer/protocol/modbus/Plugin.cc
View file

@ -3,7 +3,7 @@
#include "Modbus.h" #include "Modbus.h"
BRO_PLUGIN_BEGIN(Modbus) BRO_PLUGIN_BEGIN(Bro, Modbus)
BRO_PLUGIN_DESCRIPTION("Modbus analyzer"); BRO_PLUGIN_DESCRIPTION("Modbus analyzer");
BRO_PLUGIN_ANALYZER("MODBUS", modbus::ModbusTCP_Analyzer); BRO_PLUGIN_ANALYZER("MODBUS", modbus::ModbusTCP_Analyzer);
BRO_PLUGIN_BIF_FILE(events); BRO_PLUGIN_BIF_FILE(events);

2
src/analyzer/protocol/ncp/CMakeLists.txt
View file

@ -3,7 +3,7 @@ include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(NCP) bro_plugin_begin(Bro NCP)
bro_plugin_cc(NCP.cc Plugin.cc) bro_plugin_cc(NCP.cc Plugin.cc)
bro_plugin_bif(events.bif) bro_plugin_bif(events.bif)
bro_plugin_pac(ncp.pac) bro_plugin_pac(ncp.pac)

2
src/analyzer/protocol/ncp/Plugin.cc
View file

@ -3,7 +3,7 @@
#include "NCP.h" #include "NCP.h"
BRO_PLUGIN_BEGIN(NCP) BRO_PLUGIN_BEGIN(Bro, NCP)
BRO_PLUGIN_DESCRIPTION("NCP analyzer"); BRO_PLUGIN_DESCRIPTION("NCP analyzer");
BRO_PLUGIN_ANALYZER("NCP", ncp::NCP_Analyzer); BRO_PLUGIN_ANALYZER("NCP", ncp::NCP_Analyzer);
BRO_PLUGIN_SUPPORT_ANALYZER("Contents_NCP"); BRO_PLUGIN_SUPPORT_ANALYZER("Contents_NCP");

5
src/analyzer/protocol/netbios/CMakeLists.txt
View file

@ -2,9 +2,12 @@
include(BroPlugin) include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
include_directories(AFTER ${CMAKE_CURRENT_BINARY_DIR}/../dce-rpc)
include_directories(AFTER ${CMAKE_CURRENT_BINARY_DIR}/../smb)
bro_plugin_begin(NetBIOS) bro_plugin_begin(Bro NetBIOS)
bro_plugin_cc(NetbiosSSN.cc Plugin.cc) bro_plugin_cc(NetbiosSSN.cc Plugin.cc)
bro_plugin_bif(events.bif) bro_plugin_bif(events.bif)
bro_plugin_bif(functions.bif) bro_plugin_bif(functions.bif)
bro_plugin_end() bro_plugin_end()

2
src/analyzer/protocol/netbios/Plugin.cc
View file

@ -3,7 +3,7 @@
#include "NetbiosSSN.h" #include "NetbiosSSN.h"
BRO_PLUGIN_BEGIN(NetBIOS) BRO_PLUGIN_BEGIN(Bro, NetBIOS)
BRO_PLUGIN_DESCRIPTION("NetBIOS analyzer (support only SSN currently)"); BRO_PLUGIN_DESCRIPTION("NetBIOS analyzer (support only SSN currently)");
BRO_PLUGIN_ANALYZER("NetbiosSSN", netbios_ssn::NetbiosSSN_Analyzer); BRO_PLUGIN_ANALYZER("NetbiosSSN", netbios_ssn::NetbiosSSN_Analyzer);
BRO_PLUGIN_SUPPORT_ANALYZER("Contents_NetbiosSSN"); BRO_PLUGIN_SUPPORT_ANALYZER("Contents_NetbiosSSN");

2
src/analyzer/protocol/netflow/CMakeLists.txt
View file

@ -8,7 +8,7 @@ include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(NetFlow) bro_plugin_begin(Bro NetFlow)
bro_plugin_cc(Plugin.cc) bro_plugin_cc(Plugin.cc)
bro_plugin_bif(events.bif) bro_plugin_bif(events.bif)
bro_plugin_pac(netflow.pac netflow-protocol.pac netflow-analyzer.pac) bro_plugin_pac(netflow.pac netflow-protocol.pac netflow-analyzer.pac)

2
src/analyzer/protocol/netflow/Plugin.cc
View file

@ -1,7 +1,7 @@
#include "plugin/Plugin.h" #include "plugin/Plugin.h"
BRO_PLUGIN_BEGIN(NetFlow) BRO_PLUGIN_BEGIN(Bro, NetFlow)
BRO_PLUGIN_DESCRIPTION("NetFlow parsing code"); BRO_PLUGIN_DESCRIPTION("NetFlow parsing code");
BRO_PLUGIN_BIF_FILE(events); BRO_PLUGIN_BIF_FILE(events);
BRO_PLUGIN_END BRO_PLUGIN_END

2
src/analyzer/protocol/ntp/CMakeLists.txt
View file

@ -3,7 +3,7 @@ include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(NTP) bro_plugin_begin(Bro NTP)
bro_plugin_cc(NTP.cc Plugin.cc) bro_plugin_cc(NTP.cc Plugin.cc)
bro_plugin_bif(events.bif) bro_plugin_bif(events.bif)
bro_plugin_end() bro_plugin_end()

2
src/analyzer/protocol/ntp/Plugin.cc
View file

@ -3,7 +3,7 @@
#include "NTP.h" #include "NTP.h"
BRO_PLUGIN_BEGIN(NTP) BRO_PLUGIN_BEGIN(Bro, NTP)
BRO_PLUGIN_DESCRIPTION("NTP analyzer"); BRO_PLUGIN_DESCRIPTION("NTP analyzer");
BRO_PLUGIN_ANALYZER("NTP", ntp::NTP_Analyzer); BRO_PLUGIN_ANALYZER("NTP", ntp::NTP_Analyzer);
BRO_PLUGIN_BIF_FILE(events); BRO_PLUGIN_BIF_FILE(events);

2
src/analyzer/protocol/pia/CMakeLists.txt
View file

@ -3,7 +3,7 @@ include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(PIA) bro_plugin_begin(Bro PIA)
bro_plugin_cc(PIA.cc Plugin.cc) bro_plugin_cc(PIA.cc Plugin.cc)
bro_plugin_bif(events.bif) bro_plugin_bif(events.bif)
bro_plugin_end() bro_plugin_end()

2
src/analyzer/protocol/pia/Plugin.cc
View file

@ -3,7 +3,7 @@
#include "PIA.h" #include "PIA.h"
BRO_PLUGIN_BEGIN(PIA) BRO_PLUGIN_BEGIN(Bro, PIA)
BRO_PLUGIN_DESCRIPTION("Analyzers implementing Dynamic Protocol Detection"); BRO_PLUGIN_DESCRIPTION("Analyzers implementing Dynamic Protocol Detection");
BRO_PLUGIN_ANALYZER("PIA_TCP", pia::PIA_TCP); BRO_PLUGIN_ANALYZER("PIA_TCP", pia::PIA_TCP);
BRO_PLUGIN_ANALYZER("PIA_UDP", pia::PIA_UDP); BRO_PLUGIN_ANALYZER("PIA_UDP", pia::PIA_UDP);

2
src/analyzer/protocol/pop3/CMakeLists.txt
View file

@ -3,7 +3,7 @@ include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(POP3) bro_plugin_begin(Bro POP3)
bro_plugin_cc(POP3.cc Plugin.cc) bro_plugin_cc(POP3.cc Plugin.cc)
bro_plugin_bif(events.bif) bro_plugin_bif(events.bif)
bro_plugin_end() bro_plugin_end()

2
src/analyzer/protocol/pop3/Plugin.cc
View file

@ -3,7 +3,7 @@
#include "POP3.h" #include "POP3.h"
BRO_PLUGIN_BEGIN(POP3) BRO_PLUGIN_BEGIN(Bro, POP3)
BRO_PLUGIN_DESCRIPTION("POP3 analyzer"); BRO_PLUGIN_DESCRIPTION("POP3 analyzer");
BRO_PLUGIN_ANALYZER("POP3", pop3::POP3_Analyzer); BRO_PLUGIN_ANALYZER("POP3", pop3::POP3_Analyzer);
BRO_PLUGIN_BIF_FILE(events); BRO_PLUGIN_BIF_FILE(events);

2
src/analyzer/protocol/rpc/CMakeLists.txt
View file

@ -3,7 +3,7 @@ include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(RPC) bro_plugin_begin(Bro RPC)
bro_plugin_cc(RPC.cc NFS.cc Portmap.cc XDR.cc Plugin.cc) bro_plugin_cc(RPC.cc NFS.cc Portmap.cc XDR.cc Plugin.cc)
bro_plugin_bif(events.bif) bro_plugin_bif(events.bif)
bro_plugin_end() bro_plugin_end()

2
src/analyzer/protocol/rpc/Plugin.cc
View file

@ -5,7 +5,7 @@
#include "NFS.h" #include "NFS.h"
#include "Portmap.h" #include "Portmap.h"
BRO_PLUGIN_BEGIN(RPC) BRO_PLUGIN_BEGIN(Bro, RPC)
BRO_PLUGIN_DESCRIPTION("Analyzers for RPC-based protocols"); BRO_PLUGIN_DESCRIPTION("Analyzers for RPC-based protocols");
BRO_PLUGIN_ANALYZER("NFS", rpc::NFS_Analyzer); BRO_PLUGIN_ANALYZER("NFS", rpc::NFS_Analyzer);
BRO_PLUGIN_ANALYZER("Portmapper", rpc::Portmapper_Analyzer); BRO_PLUGIN_ANALYZER("Portmapper", rpc::Portmapper_Analyzer);

3
src/analyzer/protocol/smb/CMakeLists.txt
View file

@ -2,8 +2,9 @@
include(BroPlugin) include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
include_directories(AFTER ${CMAKE_CURRENT_BINARY_DIR}/../dce-rpc)
bro_plugin_begin(SMB) bro_plugin_begin(Bro SMB)
bro_plugin_cc(SMB.cc Plugin.cc) bro_plugin_cc(SMB.cc Plugin.cc)
bro_plugin_bif(events.bif) bro_plugin_bif(events.bif)
bro_plugin_pac(smb.pac smb-protocol.pac smb-pipe.pac smb-mailslot.pac) bro_plugin_pac(smb.pac smb-protocol.pac smb-pipe.pac smb-mailslot.pac)

2
src/analyzer/protocol/smb/Plugin.cc
View file

@ -3,7 +3,7 @@
#include "SMB.h" #include "SMB.h"
BRO_PLUGIN_BEGIN(SMB) BRO_PLUGIN_BEGIN(Bro, SMB)
BRO_PLUGIN_DESCRIPTION("SMB analyzer"); BRO_PLUGIN_DESCRIPTION("SMB analyzer");
BRO_PLUGIN_ANALYZER("SMB", smb::SMB_Analyzer); BRO_PLUGIN_ANALYZER("SMB", smb::SMB_Analyzer);
BRO_PLUGIN_SUPPORT_ANALYZER("Contents_SMB"); BRO_PLUGIN_SUPPORT_ANALYZER("Contents_SMB");

2
src/analyzer/protocol/smtp/CMakeLists.txt
View file

@ -3,7 +3,7 @@ include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(SMTP) bro_plugin_begin(Bro SMTP)
bro_plugin_cc(SMTP.cc Plugin.cc) bro_plugin_cc(SMTP.cc Plugin.cc)
bro_plugin_bif(events.bif) bro_plugin_bif(events.bif)
bro_plugin_bif(functions.bif) bro_plugin_bif(functions.bif)

2
src/analyzer/protocol/smtp/Plugin.cc
View file

@ -3,7 +3,7 @@
#include "SMTP.h" #include "SMTP.h"
BRO_PLUGIN_BEGIN(SMTP) BRO_PLUGIN_BEGIN(Bro, SMTP)
BRO_PLUGIN_DESCRIPTION("SMTP analyzer"); BRO_PLUGIN_DESCRIPTION("SMTP analyzer");
BRO_PLUGIN_ANALYZER("SMTP", smtp::SMTP_Analyzer); BRO_PLUGIN_ANALYZER("SMTP", smtp::SMTP_Analyzer);
BRO_PLUGIN_BIF_FILE(events); BRO_PLUGIN_BIF_FILE(events);

2
src/analyzer/protocol/socks/CMakeLists.txt
View file

@ -3,7 +3,7 @@ include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(SOCKS) bro_plugin_begin(Bro SOCKS)
bro_plugin_cc(SOCKS.cc Plugin.cc) bro_plugin_cc(SOCKS.cc Plugin.cc)
bro_plugin_bif(events.bif) bro_plugin_bif(events.bif)
bro_plugin_pac(socks.pac socks-protocol.pac socks-analyzer.pac) bro_plugin_pac(socks.pac socks-protocol.pac socks-analyzer.pac)

2
src/analyzer/protocol/socks/Plugin.cc
View file

@ -3,7 +3,7 @@
#include "SOCKS.h" #include "SOCKS.h"
BRO_PLUGIN_BEGIN(SOCKS) BRO_PLUGIN_BEGIN(Bro, SOCKS)
BRO_PLUGIN_DESCRIPTION("SOCKS analyzer"); BRO_PLUGIN_DESCRIPTION("SOCKS analyzer");
BRO_PLUGIN_ANALYZER("SOCKS", socks::SOCKS_Analyzer); BRO_PLUGIN_ANALYZER("SOCKS", socks::SOCKS_Analyzer);
BRO_PLUGIN_BIF_FILE(events); BRO_PLUGIN_BIF_FILE(events);

2
src/analyzer/protocol/ssh/CMakeLists.txt
View file

@ -3,7 +3,7 @@ include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(SSH) bro_plugin_begin(Bro SSH)
bro_plugin_cc(SSH.cc Plugin.cc) bro_plugin_cc(SSH.cc Plugin.cc)
bro_plugin_bif(events.bif) bro_plugin_bif(events.bif)
bro_plugin_end() bro_plugin_end()

2
src/analyzer/protocol/ssh/Plugin.cc
View file

@ -3,7 +3,7 @@
#include "SSH.h" #include "SSH.h"
BRO_PLUGIN_BEGIN(SSH) BRO_PLUGIN_BEGIN(Bro, SSH)
BRO_PLUGIN_DESCRIPTION("SSH analyzer"); BRO_PLUGIN_DESCRIPTION("SSH analyzer");
BRO_PLUGIN_ANALYZER("SSH", ssh::SSH_Analyzer); BRO_PLUGIN_ANALYZER("SSH", ssh::SSH_Analyzer);
BRO_PLUGIN_BIF_FILE(events); BRO_PLUGIN_BIF_FILE(events);

2
src/analyzer/protocol/ssl/CMakeLists.txt
View file

@ -3,7 +3,7 @@ include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(SSL) bro_plugin_begin(Bro SSL)
bro_plugin_cc(SSL.cc Plugin.cc) bro_plugin_cc(SSL.cc Plugin.cc)
bro_plugin_bif(events.bif) bro_plugin_bif(events.bif)
bro_plugin_bif(functions.bif) bro_plugin_bif(functions.bif)

2
src/analyzer/protocol/ssl/Plugin.cc
View file

@ -3,7 +3,7 @@
#include "SSL.h" #include "SSL.h"
BRO_PLUGIN_BEGIN(SSL) BRO_PLUGIN_BEGIN(Bro, SSL)
BRO_PLUGIN_DESCRIPTION("SSL analyzer"); BRO_PLUGIN_DESCRIPTION("SSL analyzer");
BRO_PLUGIN_ANALYZER("SSL", ssl::SSL_Analyzer); BRO_PLUGIN_ANALYZER("SSL", ssl::SSL_Analyzer);
BRO_PLUGIN_BIF_FILE(events); BRO_PLUGIN_BIF_FILE(events);

2
src/analyzer/protocol/stepping-stone/CMakeLists.txt
View file

@ -3,7 +3,7 @@ include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(SteppingStone) bro_plugin_begin(Bro SteppingStone)
bro_plugin_cc(SteppingStone.cc Plugin.cc) bro_plugin_cc(SteppingStone.cc Plugin.cc)
bro_plugin_bif(events.bif) bro_plugin_bif(events.bif)
bro_plugin_end() bro_plugin_end()

2
src/analyzer/protocol/stepping-stone/Plugin.cc
View file

@ -3,7 +3,7 @@
#include "SteppingStone.h" #include "SteppingStone.h"
BRO_PLUGIN_BEGIN(SteppingStone) BRO_PLUGIN_BEGIN(Bro, SteppingStone)
BRO_PLUGIN_DESCRIPTION("Stepping stone analyzer (deprecated)"); BRO_PLUGIN_DESCRIPTION("Stepping stone analyzer (deprecated)");
BRO_PLUGIN_ANALYZER("SteppingStone", stepping_stone::SteppingStone_Analyzer); BRO_PLUGIN_ANALYZER("SteppingStone", stepping_stone::SteppingStone_Analyzer);
BRO_PLUGIN_BIF_FILE(events); BRO_PLUGIN_BIF_FILE(events);

2
src/analyzer/protocol/syslog/CMakeLists.txt
View file

@ -3,7 +3,7 @@ include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(Syslog) bro_plugin_begin(Bro Syslog)
bro_plugin_cc(Syslog.cc Plugin.cc) bro_plugin_cc(Syslog.cc Plugin.cc)
bro_plugin_bif(events.bif) bro_plugin_bif(events.bif)
bro_plugin_pac(syslog.pac syslog-analyzer.pac syslog-protocol.pac) bro_plugin_pac(syslog.pac syslog-analyzer.pac syslog-protocol.pac)

2
src/analyzer/protocol/syslog/Plugin.cc
View file

@ -3,7 +3,7 @@
#include "Syslog.h" #include "Syslog.h"
BRO_PLUGIN_BEGIN(Syslog) BRO_PLUGIN_BEGIN(Bro, Syslog)
BRO_PLUGIN_DESCRIPTION("Syslog analyzer (UDP-only currently)"); BRO_PLUGIN_DESCRIPTION("Syslog analyzer (UDP-only currently)");
BRO_PLUGIN_ANALYZER("Syslog", syslog::Syslog_Analyzer); BRO_PLUGIN_ANALYZER("Syslog", syslog::Syslog_Analyzer);
BRO_PLUGIN_BIF_FILE(events); BRO_PLUGIN_BIF_FILE(events);

2
src/analyzer/protocol/tcp/CMakeLists.txt
View file

@ -3,7 +3,7 @@ include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(TCP) bro_plugin_begin(Bro TCP)
bro_plugin_cc(TCP.cc TCP_Endpoint.cc TCP_Reassembler.cc ContentLine.cc Stats.cc Plugin.cc) bro_plugin_cc(TCP.cc TCP_Endpoint.cc TCP_Reassembler.cc ContentLine.cc Stats.cc Plugin.cc)
bro_plugin_bif(events.bif) bro_plugin_bif(events.bif)
bro_plugin_bif(functions.bif) bro_plugin_bif(functions.bif)

2
src/analyzer/protocol/tcp/Plugin.cc
View file

@ -3,7 +3,7 @@
#include "TCP.h" #include "TCP.h"
BRO_PLUGIN_BEGIN(TCP) BRO_PLUGIN_BEGIN(Bro, TCP)
BRO_PLUGIN_DESCRIPTION("TCP analyzer"); BRO_PLUGIN_DESCRIPTION("TCP analyzer");
BRO_PLUGIN_ANALYZER("TCP", tcp::TCP_Analyzer); BRO_PLUGIN_ANALYZER("TCP", tcp::TCP_Analyzer);
BRO_PLUGIN_ANALYZER("TCPStats", tcp::TCPStats_Analyzer); BRO_PLUGIN_ANALYZER("TCPStats", tcp::TCPStats_Analyzer);

2
src/analyzer/protocol/teredo/CMakeLists.txt
View file

@ -3,7 +3,7 @@ include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(Teredo) bro_plugin_begin(Bro Teredo)
bro_plugin_cc(Teredo.cc Plugin.cc) bro_plugin_cc(Teredo.cc Plugin.cc)
bro_plugin_bif(events.bif) bro_plugin_bif(events.bif)
bro_plugin_end() bro_plugin_end()

2
src/analyzer/protocol/teredo/Plugin.cc
View file

@ -3,7 +3,7 @@
#include "Teredo.h" #include "Teredo.h"
BRO_PLUGIN_BEGIN(Teredo) BRO_PLUGIN_BEGIN(Bro, Teredo)
BRO_PLUGIN_DESCRIPTION("Teredo analyzer"); BRO_PLUGIN_DESCRIPTION("Teredo analyzer");
BRO_PLUGIN_ANALYZER("Teredo", teredo::Teredo_Analyzer); BRO_PLUGIN_ANALYZER("Teredo", teredo::Teredo_Analyzer);
BRO_PLUGIN_BIF_FILE(events); BRO_PLUGIN_BIF_FILE(events);

2
src/analyzer/protocol/udp/CMakeLists.txt
View file

@ -3,7 +3,7 @@ include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(UDP) bro_plugin_begin(Bro UDP)
bro_plugin_cc(UDP.cc Plugin.cc) bro_plugin_cc(UDP.cc Plugin.cc)
bro_plugin_bif(events.bif) bro_plugin_bif(events.bif)
bro_plugin_end() bro_plugin_end()

2
src/analyzer/protocol/udp/Plugin.cc
View file

@ -3,7 +3,7 @@
#include "analyzer/protocol/udp/UDP.h" #include "analyzer/protocol/udp/UDP.h"
BRO_PLUGIN_BEGIN(UDP) BRO_PLUGIN_BEGIN(Bro, UDP)
BRO_PLUGIN_DESCRIPTION("UDP Analyzer"); BRO_PLUGIN_DESCRIPTION("UDP Analyzer");
BRO_PLUGIN_ANALYZER("UDP", udp::UDP_Analyzer); BRO_PLUGIN_ANALYZER("UDP", udp::UDP_Analyzer);
BRO_PLUGIN_BIF_FILE(events); BRO_PLUGIN_BIF_FILE(events);

2
src/analyzer/protocol/zip/CMakeLists.txt
View file

@ -3,7 +3,7 @@ include(BroPlugin)
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
bro_plugin_begin(ZIP) bro_plugin_begin(Bro ZIP)
bro_plugin_cc(ZIP.cc Plugin.cc) bro_plugin_cc(ZIP.cc Plugin.cc)
bro_plugin_bif(events.bif) bro_plugin_bif(events.bif)
bro_plugin_end() bro_plugin_end()

2
src/analyzer/protocol/zip/Plugin.cc
View file

@ -3,7 +3,7 @@
#include "ZIP.h" #include "ZIP.h"
BRO_PLUGIN_BEGIN(ZIP) BRO_PLUGIN_BEGIN(Bro, ZIP)
BRO_PLUGIN_DESCRIPTION("Generic ZIP support analyzer"); BRO_PLUGIN_DESCRIPTION("Generic ZIP support analyzer");
BRO_PLUGIN_ANALYZER_BARE("ZIP"); BRO_PLUGIN_ANALYZER_BARE("ZIP");
BRO_PLUGIN_BIF_FILE(events); BRO_PLUGIN_BIF_FILE(events);

2
src/bro.bif
View file

@ -2626,8 +2626,6 @@ function decode_base64_custom%(s: string, a: string%): string
%} %}
%%{ %%{
#include "analyzer/protocol/dce-rpc/DCE_RPC.h"
typedef struct { typedef struct {
uint32 time_low; uint32 time_low;
uint16 time_mid; uint16 time_mid;

9
src/builtin-func.l
View file

@ -193,7 +193,7 @@ void init_alternative_mode()
snprintf(auto_gen_comment, n, snprintf(auto_gen_comment, n,
"This file was automatically generated by bifcl from %s (%s mode).", "This file was automatically generated by bifcl from %s (%s mode).",
input_filename_with_path, plugin ? "plugin" : "subdir"); input_filename_with_path, plugin ? "plugin" : "alternative");
fprintf(fp_bro_init, "# %s\n\n", auto_gen_comment); fprintf(fp_bro_init, "# %s\n\n", auto_gen_comment);
fprintf(fp_func_def, "// %s\n\n", auto_gen_comment); fprintf(fp_func_def, "// %s\n\n", auto_gen_comment);
@ -211,10 +211,15 @@ void init_alternative_mode()
*p = '_'; *p = '_';
} }
fprintf(fp_func_h, "#if defined(BRO_IN_NETVAR) || ! defined(%s)\n", guard);
fprintf(fp_func_h, "#ifndef BRO_IN_NETVAR\n");
fprintf(fp_func_h, "#ifndef %s\n", guard); fprintf(fp_func_h, "#ifndef %s\n", guard);
fprintf(fp_func_h, "#define %s\n", guard); fprintf(fp_func_h, "#define %s\n", guard);
fprintf(fp_func_h, "\n");
fprintf(fp_func_h, "#include \"bro-bif.h\"\n"); fprintf(fp_func_h, "#include \"bro-bif.h\"\n");
fprintf(fp_func_h, "#endif\n");
fprintf(fp_func_h, "#endif\n");
fprintf(fp_func_h, "\n");
fprintf(fp_func_def, "\n"); fprintf(fp_func_def, "\n");
fprintf(fp_func_def, "#include \"%s.h\"\n", input_filename); fprintf(fp_func_def, "#include \"%s.h\"\n", input_filename);

8
src/plugin/Macros.h
View file

@ -9,14 +9,14 @@
#define _BRO_PLUGIN_VERSION_DEFAULT -1 #define _BRO_PLUGIN_VERSION_DEFAULT -1
#define BRO_PLUGIN_BEGIN(_name) \ #define BRO_PLUGIN_BEGIN(_ns, _name) \
namespace plugin { namespace _name { \ namespace plugin { namespace _ns ## _ ## _name {\
class Plugin : public plugin::Plugin { \ class Plugin : public plugin::Plugin { \
protected: \ protected: \
void Init() \ void Init() \
{ \ { \
SetName(#_name); \ SetName(#_ns "::" #_name); \
SetVersion(_BRO_PLUGIN_VERSION_DEFAULT); \ SetVersion(_BRO_PLUGIN_VERSION_DEFAULT);\
SetAPIVersion(BRO_PLUGIN_API_VERSION); SetAPIVersion(BRO_PLUGIN_API_VERSION);
#define BRO_PLUGIN_END \ #define BRO_PLUGIN_END \