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

GH-239: Rename bro to zeek, bro-config to zeek-config, and bro-path-dev to zeek-path-dev.

Browse source 
This also installs symlinks from "zeek" and "bro-config" to a wrapper
script that prints a deprecation warning.

The btests pass, but this is still WIP. broctl renaming is still
missing.

#239
This commit is contained in:
Robin Sommer 2019-04-23 14:25:56 +02:00
parent 375b151a4b
commit 789cb376fd
1119 changed files with 1686 additions and 1647 deletions
Download patch file Download diff file Expand all files Collapse all files

41
CMakeLists.txt
View file

@ -39,15 +39,15 @@ get_filename_component(BRO_SCRIPT_INSTALL_PATH ${BRO_SCRIPT_INSTALL_PATH}
set(BRO_PLUGIN_INSTALL_PATH ${BRO_ROOT_DIR}/lib/bro/plugins CACHE STRING "Installation path for plugins" FORCE) set(BRO_PLUGIN_INSTALL_PATH ${BRO_ROOT_DIR}/lib/bro/plugins CACHE STRING "Installation path for plugins" FORCE)
configure_file(bro-path-dev.in ${CMAKE_CURRENT_BINARY_DIR}/bro-path-dev) configure_file(zeek-path-dev.in ${CMAKE_CURRENT_BINARY_DIR}/zeek-path-dev)
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bro-path-dev.sh file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/zeek-path-dev.sh
"export BROPATH=`${CMAKE_CURRENT_BINARY_DIR}/bro-path-dev`\n" "export BROPATH=`${CMAKE_CURRENT_BINARY_DIR}/zeek-path-dev`\n"
"export BRO_PLUGIN_PATH=\"${CMAKE_CURRENT_BINARY_DIR}/src\":${BRO_PLUGIN_PATH}\n" "export BRO_PLUGIN_PATH=\"${CMAKE_CURRENT_BINARY_DIR}/src\":${BRO_PLUGIN_PATH}\n"
"export PATH=\"${CMAKE_CURRENT_BINARY_DIR}/src\":$PATH\n") "export PATH=\"${CMAKE_CURRENT_BINARY_DIR}/src\":$PATH\n")
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bro-path-dev.csh file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/zeek-path-dev.csh
"setenv BROPATH `${CMAKE_CURRENT_BINARY_DIR}/bro-path-dev`\n" "setenv BROPATH `${CMAKE_CURRENT_BINARY_DIR}/zeek-path-dev`\n"
"setenv BRO_PLUGIN_PATH \"${CMAKE_CURRENT_BINARY_DIR}/src\":${BRO_PLUGIN_PATH}\n" "setenv BRO_PLUGIN_PATH \"${CMAKE_CURRENT_BINARY_DIR}/src\":${BRO_PLUGIN_PATH}\n"
"setenv PATH \"${CMAKE_CURRENT_BINARY_DIR}/src\":$PATH\n") "setenv PATH \"${CMAKE_CURRENT_BINARY_DIR}/src\":$PATH\n")
@ -254,36 +254,43 @@ if ( NOT BINARY_PACKAGING_MODE )
endif () endif ()
string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER) string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/bro-config.h.in configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zeek-config.h.in
${CMAKE_CURRENT_BINARY_DIR}/bro-config.h) ${CMAKE_CURRENT_BINARY_DIR}/zeek-config.h)
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/bro-config.h DESTINATION include/bro) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/zeek-config.h DESTINATION include/bro)
if ( CAF_ROOT_DIR ) if ( CAF_ROOT_DIR )
set(BRO_CONFIG_CAF_ROOT_DIR ${CAF_ROOT_DIR}) set(ZEEK_CONFIG_CAF_ROOT_DIR ${CAF_ROOT_DIR})
else () else ()
set(BRO_CONFIG_CAF_ROOT_DIR ${BRO_ROOT_DIR}) set(ZEEK_CONFIG_CAF_ROOT_DIR ${BRO_ROOT_DIR})
endif () endif ()
if ( BinPAC_ROOT_DIR ) if ( BinPAC_ROOT_DIR )
set(BRO_CONFIG_BINPAC_ROOT_DIR ${BinPAC_ROOT_DIR}) set(ZEEK_CONFIG_BINPAC_ROOT_DIR ${BinPAC_ROOT_DIR})
else () else ()
set(BRO_CONFIG_BINPAC_ROOT_DIR ${BRO_ROOT_DIR}) set(ZEEK_CONFIG_BINPAC_ROOT_DIR ${BRO_ROOT_DIR})
endif () endif ()
if ( BROKER_ROOT_DIR ) if ( BROKER_ROOT_DIR )
set(BRO_CONFIG_BROKER_ROOT_DIR ${BROKER_ROOT_DIR}) set(ZEEK_CONFIG_BROKER_ROOT_DIR ${BROKER_ROOT_DIR})
else () else ()
set(BRO_CONFIG_BROKER_ROOT_DIR ${BRO_ROOT_DIR}) set(ZEEK_CONFIG_BROKER_ROOT_DIR ${BRO_ROOT_DIR})
endif () endif ()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/bro-config.in configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zeek-config.in
${CMAKE_CURRENT_BINARY_DIR}/bro-config @ONLY) ${CMAKE_CURRENT_BINARY_DIR}/zeek-config @ONLY)
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/bro-config DESTINATION bin) install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/zeek-config DESTINATION bin)
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cmake DESTINATION share/bro install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cmake DESTINATION share/bro
USE_SOURCE_PERMISSIONS) USE_SOURCE_PERMISSIONS)
# Install wrapper script for Bro-to-Zeek renaming.
include(InstallShellScript)
include(InstallSymlink)
InstallShellScript("bin" "zeek-wrapper.in" "zeek-wrapper")
InstallSymlink("${CMAKE_INSTALL_PREFIX}/bin/zeek-wrapper" "${CMAKE_INSTALL_PREFIX}/bin/bro-config")
InstallSymlink("${CMAKE_INSTALL_PREFIX}/include/bro/zeek-config.h" "${CMAKE_INSTALL_PREFIX}/include/bro/bro-config.h")
######################################################################## ########################################################################
## Recurse on sub-directories ## Recurse on sub-directories

2
doc

@ -1 +1 @@
Subproject commit 856db2bb4014d15a94cb336d7e5e8ca1d4627b1e Subproject commit d9cf0d7a242b6924797aea0a70bd87879b8f1e17

0
man/bro.8 → man/zeek.8
View file

2
scripts/policy/frameworks/control/controllee.zeek
View file

@ -5,7 +5,7 @@
##! to the specific analysis scripts desired. It may also need a node ##! to the specific analysis scripts desired. It may also need a node
##! configured as a controller node in the communications nodes configuration:: ##! configured as a controller node in the communications nodes configuration::
##! ##!
##! bro <scripts> frameworks/control/controllee ##! zeek <scripts> frameworks/control/controllee
@load base/frameworks/control @load base/frameworks/control
@load base/frameworks/broker @load base/frameworks/broker

2
scripts/policy/frameworks/control/controller.zeek
View file

@ -4,7 +4,7 @@
##! ##!
##! It's intended to be used from the command line like this:: ##! It's intended to be used from the command line like this::
##! ##!
##! bro <scripts> frameworks/control/controller Control::host=<host_addr> Control::host_port=<host_port> Control::cmd=<command> [Control::arg=<arg>] ##! zeek <scripts> frameworks/control/controller Control::host=<host_addr> Control::host_port=<host_port> Control::cmd=<command> [Control::arg=<arg>]
@load base/frameworks/control @load base/frameworks/control
@load base/frameworks/broker @load base/frameworks/broker

2
src/Attr.cc
View file

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include "Attr.h" #include "Attr.h"
#include "Expr.h" #include "Expr.h"

2
src/Base64.cc
View file

@ -1,4 +1,4 @@
#include "bro-config.h" #include "zeek-config.h"
#include "Base64.h" #include "Base64.h"
#include <math.h> #include <math.h>

2
src/BroString.cc
View file

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include <algorithm> #include <algorithm>
#include <ctype.h> #include <ctype.h>

2
src/CCL.cc
View file

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include "CCL.h" #include "CCL.h"
#include "RE.h" #include "RE.h"

28
src/CMakeLists.txt
View file

@ -353,24 +353,28 @@ set(bro_SRCS
collect_headers(bro_HEADERS ${bro_SRCS}) collect_headers(bro_HEADERS ${bro_SRCS})
if ( bro_HAVE_OBJECT_LIBRARIES ) if ( bro_HAVE_OBJECT_LIBRARIES )
add_executable(bro ${bro_SRCS} ${bro_HEADERS} ${bro_SUBDIRS}) add_executable(zeek ${bro_SRCS} ${bro_HEADERS} ${bro_SUBDIRS})
target_link_libraries(bro ${brodeps} ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS}) target_link_libraries(zeek ${brodeps} ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
else () else ()
add_executable(bro ${bro_SRCS} ${bro_HEADERS}) add_executable(zeek ${bro_SRCS} ${bro_HEADERS})
target_link_libraries(bro ${bro_SUBDIRS} ${brodeps} ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS}) target_link_libraries(zeek ${bro_SUBDIRS} ${brodeps} ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
endif () endif ()
if ( NOT "${bro_LINKER_FLAGS}" STREQUAL "" ) if ( NOT "${bro_LINKER_FLAGS}" STREQUAL "" )
set_target_properties(bro PROPERTIES LINK_FLAGS "${bro_LINKER_FLAGS}") set_target_properties(zeek PROPERTIES LINK_FLAGS "${bro_LINKER_FLAGS}")
endif () endif ()
install(TARGETS bro DESTINATION bin) install(TARGETS zeek DESTINATION bin)
set(BRO_EXE bro # Install wrapper script for Bro-to-Zeek renaming.
CACHE STRING "Bro executable binary" FORCE) include(InstallSymlink)
InstallSymlink("${CMAKE_INSTALL_PREFIX}/bin/zeek-wrapper" "${CMAKE_INSTALL_PREFIX}/bin/bro")
set(BRO_EXE_PATH ${CMAKE_CURRENT_BINARY_DIR}/bro set(BRO_EXE zeek
CACHE STRING "Path to Bro executable binary" FORCE) CACHE STRING "Zeek executable binary" FORCE)
set(BRO_EXE_PATH ${CMAKE_CURRENT_BINARY_DIR}/zeek
CACHE STRING "Path to Zeek executable binary" FORCE)
# Target to create all the autogenerated files. # Target to create all the autogenerated files.
add_custom_target(generate_outputs_stage1) add_custom_target(generate_outputs_stage1)
@ -389,12 +393,12 @@ add_dependencies(generate_outputs generate_outputs_stage2a generate_outputs_stag
# Build __load__.zeek files for standard *.bif.zeek. # Build __load__.zeek files for standard *.bif.zeek.
bro_bif_create_loader(bif_loader "${bro_BASE_BIF_SCRIPTS}") bro_bif_create_loader(bif_loader "${bro_BASE_BIF_SCRIPTS}")
add_dependencies(bif_loader ${bro_SUBDIRS}) add_dependencies(bif_loader ${bro_SUBDIRS})
add_dependencies(bro bif_loader) add_dependencies(zeek bif_loader)
# Build __load__.zeek files for plugins/*.bif.zeek. # Build __load__.zeek files for plugins/*.bif.zeek.
bro_bif_create_loader(bif_loader_plugins "${bro_PLUGIN_BIF_SCRIPTS}") bro_bif_create_loader(bif_loader_plugins "${bro_PLUGIN_BIF_SCRIPTS}")
add_dependencies(bif_loader_plugins ${bro_SUBDIRS}) add_dependencies(bif_loader_plugins ${bro_SUBDIRS})
add_dependencies(bro bif_loader_plugins) add_dependencies(zeek bif_loader_plugins)
# Install *.bif.zeek. # Install *.bif.zeek.
install(DIRECTORY ${CMAKE_BINARY_DIR}/scripts/base/bif DESTINATION ${BRO_SCRIPT_INSTALL_PATH}/base) install(DIRECTORY ${CMAKE_BINARY_DIR}/scripts/base/bif DESTINATION ${BRO_SCRIPT_INSTALL_PATH}/base)

2
src/ChunkedIO.cc
View file

@ -11,7 +11,7 @@
#include <algorithm> #include <algorithm>
#include "bro-config.h" #include "zeek-config.h"
#include "ChunkedIO.h" #include "ChunkedIO.h"
#include "NetVar.h" #include "NetVar.h"
#include "RemoteSerializer.h" #include "RemoteSerializer.h"

2
src/ChunkedIO.h
View file

@ -3,7 +3,7 @@
#ifndef CHUNKEDIO_H #ifndef CHUNKEDIO_H
#define CHUNKEDIO_H #define CHUNKEDIO_H
#include "bro-config.h" #include "zeek-config.h"
#include "List.h" #include "List.h"
#include "util.h" #include "util.h"
#include "Flare.h" #include "Flare.h"

2
src/CompHash.cc
View file

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include "CompHash.h" #include "CompHash.h"
#include "Val.h" #include "Val.h"

2
src/Conn.cc
View file

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include <ctype.h> #include <ctype.h>

2
src/DFA.cc
View file

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include "EquivClass.h" #include "EquivClass.h"
#include "DFA.h" #include "DFA.h"

2
src/DNS_Mgr.cc
View file

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>

2
src/DbgBreakpoint.cc
View file

@ -1,6 +1,6 @@
// Implementation of breakpoints. // Implementation of breakpoints.
#include "bro-config.h" #include "zeek-config.h"
#include <assert.h> #include <assert.h>

2
src/DbgHelp.cc
View file

@ -1,5 +1,5 @@
// Bro Debugger Help // Bro Debugger Help
#include "bro-config.h" #include "zeek-config.h"
#include "Debug.h" #include "Debug.h"

2
src/DbgWatch.cc
View file

@ -1,6 +1,6 @@
// Implementation of watches // Implementation of watches
#include "bro-config.h" #include "zeek-config.h"
#include "Debug.h" #include "Debug.h"
#include "DbgWatch.h" #include "DbgWatch.h"

2
src/Debug.cc
View file

@ -1,6 +1,6 @@
// Debugging support for Bro policy files. // Debugging support for Bro policy files.
#include "bro-config.h" #include "zeek-config.h"
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>

2
src/DebugCmds.cc
View file

@ -1,7 +1,7 @@
// Support routines to help deal with Bro debugging commands and // Support routines to help deal with Bro debugging commands and
// implementation of most commands. // implementation of most commands.
#include "bro-config.h" #include "zeek-config.h"
#include <sys/types.h> #include <sys/types.h>

2
src/Desc.cc
View file

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>

2
src/Dict.cc
View file

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#ifdef HAVE_MEMORY_H #ifdef HAVE_MEMORY_H
#include <memory.h> #include <memory.h>

2
src/Discard.cc
View file

@ -2,7 +2,7 @@
#include <algorithm> #include <algorithm>
#include "bro-config.h" #include "zeek-config.h"
#include "Net.h" #include "Net.h"
#include "Var.h" #include "Var.h"

2
src/EquivClass.cc
View file

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include "EquivClass.h" #include "EquivClass.h"

2
src/Event.cc
View file

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include "Event.h" #include "Event.h"
#include "Func.h" #include "Func.h"

2
src/Expr.cc
View file

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include "Expr.h" #include "Expr.h"
#include "Event.h" #include "Event.h"

2
src/File.cc
View file

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include <sys/types.h> #include <sys/types.h>
#ifdef TIME_WITH_SYS_TIME #ifdef TIME_WITH_SYS_TIME

2
src/Frag.cc
View file

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include "util.h" #include "util.h"
#include "Hash.h" #include "Hash.h"

2
src/Frame.cc
View file

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include "Frame.h" #include "Frame.h"
#include "Stmt.h" #include "Stmt.h"

2
src/Func.cc
View file

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>

2
src/Hash.cc
View file

@ -15,7 +15,7 @@
// for the adversary to construct conflicts, though I do not know if // for the adversary to construct conflicts, though I do not know if
// HMAC/MD5 is provably universal. // HMAC/MD5 is provably universal.
#include "bro-config.h" #include "zeek-config.h"
#include "Hash.h" #include "Hash.h"
#include "Reporter.h" #include "Reporter.h"

2
src/ID.cc
View file

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include "ID.h" #include "ID.h"
#include "Expr.h" #include "Expr.h"

2
src/IP.h
View file

@ -3,7 +3,7 @@
#ifndef ip_h #ifndef ip_h
#define ip_h #define ip_h
#include "bro-config.h" #include "zeek-config.h"
#include "net_util.h" #include "net_util.h"
#include "IPAddr.h" #include "IPAddr.h"
#include "Reporter.h" #include "Reporter.h"

2
src/IntSet.cc
View file

@ -1,4 +1,4 @@
#include "bro-config.h" #include "zeek-config.h"
#ifdef HAVE_MEMORY_H #ifdef HAVE_MEMORY_H
#include <memory.h> #include <memory.h>

2
src/List.cc
View file

@ -1,4 +1,4 @@
#include "bro-config.h" #include "zeek-config.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>

2
src/NFA.cc
View file

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include "NFA.h" #include "NFA.h"
#include "EquivClass.h" #include "EquivClass.h"

2
src/Net.cc
View file

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include <sys/types.h> #include <sys/types.h>
#ifdef TIME_WITH_SYS_TIME #ifdef TIME_WITH_SYS_TIME

2
src/NetVar.cc
View file

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include "Var.h" #include "Var.h"
#include "NetVar.h" #include "NetVar.h"

2
src/Obj.cc
View file

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include <stdlib.h> #include <stdlib.h>

2
src/PacketDumper.cc
View file

@ -1,7 +1,7 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>

2
src/PolicyFile.cc
View file

@ -1,4 +1,4 @@
#include "bro-config.h" #include "zeek-config.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>

2
src/PriorityQueue.cc
View file

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>

2
src/Queue.cc
View file

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include <string.h> #include <string.h>

2
src/RE.cc
View file

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include <stdlib.h> #include <stdlib.h>
#include <utility> #include <utility>

2
src/Reassem.cc
View file

@ -3,7 +3,7 @@
#include <algorithm> #include <algorithm>
#include <vector> #include <vector>
#include "bro-config.h" #include "zeek-config.h"
#include "Reassem.h" #include "Reassem.h"
#include "Serializer.h" #include "Serializer.h"

2
src/RemoteSerializer.cc
View file

@ -159,7 +159,7 @@
#include <strings.h> #include <strings.h>
#include <stdarg.h> #include <stdarg.h>
#include "bro-config.h" #include "zeek-config.h"
#ifdef TIME_WITH_SYS_TIME #ifdef TIME_WITH_SYS_TIME
# include <sys/time.h> # include <sys/time.h>
# include <time.h> # include <time.h>

2
src/Reporter.cc
View file

@ -4,7 +4,7 @@
#include <syslog.h> #include <syslog.h>
#include "bro-config.h" #include "zeek-config.h"
#include "Reporter.h" #include "Reporter.h"
#include "Event.h" #include "Event.h"
#include "NetVar.h" #include "NetVar.h"

2
src/Rule.cc
View file

@ -1,4 +1,4 @@
#include "bro-config.h" #include "zeek-config.h"
#include "Rule.h" #include "Rule.h"
#include "RuleMatcher.h" #include "RuleMatcher.h"

2
src/RuleAction.cc
View file

@ -1,7 +1,7 @@
#include <string> #include <string>
using std::string; using std::string;
#include "bro-config.h" #include "zeek-config.h"
#include "RuleAction.h" #include "RuleAction.h"
#include "RuleMatcher.h" #include "RuleMatcher.h"

2
src/RuleCondition.cc
View file

@ -1,4 +1,4 @@
#include "bro-config.h" #include "zeek-config.h"
#include "RuleCondition.h" #include "RuleCondition.h"
#include "analyzer/protocol/tcp/TCP.h" #include "analyzer/protocol/tcp/TCP.h"

2
src/RuleMatcher.cc
View file

@ -1,7 +1,7 @@
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include "bro-config.h" #include "zeek-config.h"
#include "analyzer/Analyzer.h" #include "analyzer/Analyzer.h"
#include "RuleMatcher.h" #include "RuleMatcher.h"

2
src/Scope.cc
View file

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include "ID.h" #include "ID.h"
#include "Val.h" #include "Val.h"

2
src/SerialObj.h
View file

@ -37,7 +37,7 @@
#include "DebugLogger.h" #include "DebugLogger.h"
#include "Continuation.h" #include "Continuation.h"
#include "SerialTypes.h" #include "SerialTypes.h"
#include "bro-config.h" #include "zeek-config.h"
#if SIZEOF_LONG_LONG < 8 #if SIZEOF_LONG_LONG < 8
# error "Serialization requires that sizeof(long long) is at least 8. (Remove this message only if you know what you're doing.)" # error "Serialization requires that sizeof(long long) is at least 8. (Remove this message only if you know what you're doing.)"

2
src/Sessions.cc
View file

@ -1,7 +1,7 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include <arpa/inet.h> #include <arpa/inet.h>

2
src/SmithWaterman.cc
View file

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include <algorithm> #include <algorithm>
#include <ctype.h> #include <ctype.h>

2
src/Stmt.cc
View file

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include "Expr.h" #include "Expr.h"
#include "Event.h" #include "Event.h"

2
src/Tag.h
View file

@ -3,7 +3,7 @@
#ifndef TAG_H #ifndef TAG_H
#define TAG_H #define TAG_H
#include "bro-config.h" #include "zeek-config.h"
#include "util.h" #include "util.h"
#include "Type.h" #include "Type.h"

2
src/Timer.cc
View file

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include "util.h" #include "util.h"
#include "Timer.h" #include "Timer.h"

2
src/TunnelEncapsulation.h
View file

@ -3,7 +3,7 @@
#ifndef TUNNELS_H #ifndef TUNNELS_H
#define TUNNELS_H #define TUNNELS_H
#include "bro-config.h" #include "zeek-config.h"
#include "NetVar.h" #include "NetVar.h"
#include "IPAddr.h" #include "IPAddr.h"
#include "Val.h" #include "Val.h"

2
src/Type.cc
View file

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include "Type.h" #include "Type.h"
#include "Attr.h" #include "Attr.h"

2
src/Val.cc
View file

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/param.h> #include <sys/param.h>

2
src/Var.cc
View file

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include "Var.h" #include "Var.h"
#include "Func.h" #include "Func.h"

2
src/analyzer/Component.h
View file

@ -7,7 +7,7 @@
#include "plugin/Component.h" #include "plugin/Component.h"
#include "plugin/TaggedComponent.h" #include "plugin/TaggedComponent.h"
#include "../bro-config.h" #include "../zeek-config.h"
#include "../util.h" #include "../util.h"
class Connection; class Connection;

2
src/analyzer/Tag.h
View file

@ -3,7 +3,7 @@
#ifndef ANALYZER_TAG_H #ifndef ANALYZER_TAG_H
#define ANALYZER_TAG_H #define ANALYZER_TAG_H
#include "bro-config.h" #include "zeek-config.h"
#include "util.h" #include "util.h"
#include "../Tag.h" #include "../Tag.h"
#include "plugin/TaggedComponent.h" #include "plugin/TaggedComponent.h"

2
src/analyzer/protocol/arp/ARP.h
View file

@ -3,7 +3,7 @@
#ifndef ANALYZER_PROTOCOL_ARP_ARP_H #ifndef ANALYZER_PROTOCOL_ARP_ARP_H
#define ANALYZER_PROTOCOL_ARP_ARP_H #define ANALYZER_PROTOCOL_ARP_ARP_H
#include "bro-config.h" #include "zeek-config.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>

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

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include "BackDoor.h" #include "BackDoor.h"
#include "Event.h" #include "Event.h"

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

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include <stdlib.h> #include <stdlib.h>
#include <string> #include <string>

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

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include <ctype.h> #include <ctype.h>
#include <sys/types.h> #include <sys/types.h>

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

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include <ctype.h> #include <ctype.h>

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

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include <stdlib.h> #include <stdlib.h>

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

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include <ctype.h> #include <ctype.h>

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

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include <ctype.h> #include <ctype.h>
#include <math.h> #include <math.h>

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

@ -2,7 +2,7 @@
#include <algorithm> #include <algorithm>
#include "bro-config.h" #include "zeek-config.h"
#include "Net.h" #include "Net.h"
#include "NetVar.h" #include "NetVar.h"

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

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include <ctype.h> #include <ctype.h>

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

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include "InterConn.h" #include "InterConn.h"
#include "Event.h" #include "Event.h"

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

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include <ctype.h> #include <ctype.h>
#include <stdlib.h> #include <stdlib.h>

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

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include <stdlib.h> #include <stdlib.h>

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

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include "NetVar.h" #include "NetVar.h"
#include "Event.h" #include "Event.h"

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

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include "NetVar.h" #include "NetVar.h"
#include "Event.h" #include "Event.h"

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

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include "Telnet.h" #include "Telnet.h"
#include "NVT.h" #include "NVT.h"

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

@ -1,4 +1,4 @@
#include "bro-config.h" #include "zeek-config.h"
#include "NetVar.h" #include "NetVar.h"
#include "MIME.h" #include "MIME.h"

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

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include <stdlib.h> #include <stdlib.h>
#include <string> #include <string>

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

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include <ctype.h> #include <ctype.h>

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

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include "NetVar.h" #include "NetVar.h"
#include "NTP.h" #include "NTP.h"

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

@ -1,7 +1,7 @@
// This code contributed to Bro by Florian Schimandl, Hugh Dollman and // This code contributed to Bro by Florian Schimandl, Hugh Dollman and
// Robin Sommer. // Robin Sommer.
#include "bro-config.h" #include "zeek-config.h"
#include <stdlib.h> #include <stdlib.h>
#include <iostream> #include <iostream>

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

@ -3,7 +3,7 @@
#include <algorithm> #include <algorithm>
#include <vector> #include <vector>
#include "bro-config.h" #include "zeek-config.h"
#include "NetVar.h" #include "NetVar.h"
#include "XDR.h" #include "XDR.h"

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

@ -3,7 +3,7 @@
#include <algorithm> #include <algorithm>
#include <vector> #include <vector>
#include "bro-config.h" #include "zeek-config.h"
#include "NetVar.h" #include "NetVar.h"
#include "XDR.h" #include "XDR.h"

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

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include "NetVar.h" #include "NetVar.h"
#include "XDR.h" #include "XDR.h"

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

@ -4,7 +4,7 @@
#include <algorithm> #include <algorithm>
#include "bro-config.h" #include "zeek-config.h"
#include "NetVar.h" #include "NetVar.h"
#include "XDR.h" #include "XDR.h"

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

@ -2,7 +2,7 @@
#include <algorithm> #include <algorithm>
#include "bro-config.h" #include "zeek-config.h"
#include "XDR.h" #include "XDR.h"

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

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include <stdlib.h> #include <stdlib.h>

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

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include <stdlib.h> #include <stdlib.h>

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

@ -2,7 +2,7 @@
#include <algorithm> #include <algorithm>
#include "bro-config.h" #include "zeek-config.h"
#include "Net.h" #include "Net.h"
#include "NetVar.h" #include "NetVar.h"

2
src/analyzer/protocol/zip/ZIP.h
View file

@ -3,7 +3,7 @@
#ifndef ANALYZER_PROTOCOL_ZIP_ZIP_H #ifndef ANALYZER_PROTOCOL_ZIP_ZIP_H
#define ANALYZER_PROTOCOL_ZIP_ZIP_H #define ANALYZER_PROTOCOL_ZIP_ZIP_H
#include "bro-config.h" #include "zeek-config.h"
#include "zlib.h" #include "zlib.h"
#include "analyzer/protocol/tcp/TCP.h" #include "analyzer/protocol/tcp/TCP.h"

2
src/bsd-getopt-long.c
View file

@ -54,7 +54,7 @@
#define IN_GETOPT_LONG_C 1 #define IN_GETOPT_LONG_C 1
#include <bro-config.h> #include <zeek-config.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>

2
src/file_analysis/Component.h
View file

@ -9,7 +9,7 @@
#include "Val.h" #include "Val.h"
#include "../bro-config.h" #include "../zeek-config.h"
#include "../util.h" #include "../util.h"
namespace file_analysis { namespace file_analysis {

2
src/file_analysis/Tag.h
View file

@ -3,7 +3,7 @@
#ifndef FILE_ANALYZER_TAG_H #ifndef FILE_ANALYZER_TAG_H
#define FILE_ANALYZER_TAG_H #define FILE_ANALYZER_TAG_H
#include "bro-config.h" #include "zeek-config.h"
#include "util.h" #include "util.h"
#include "../Tag.h" #include "../Tag.h"
#include "plugin/TaggedComponent.h" #include "plugin/TaggedComponent.h"

2
src/input/Tag.h
View file

@ -3,7 +3,7 @@
#ifndef INPUT_TAG_H #ifndef INPUT_TAG_H
#define INPUT_TAG_H #define INPUT_TAG_H
#include "bro-config.h" #include "zeek-config.h"
#include "util.h" #include "util.h"
#include "../Tag.h" #include "../Tag.h"
#include "plugin/TaggedComponent.h" #include "plugin/TaggedComponent.h"

2
src/input/readers/sqlite/SQLite.cc
View file

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright. // See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h" #include "zeek-config.h"
#include <fstream> #include <fstream>
#include <sstream> #include <sstream>

Some files were not shown because too many files have changed in this diff Show more