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

Merge remote-tracking branch 'origin/topic/robin/gh-239'

Browse source 
* origin/topic/robin/gh-239:
  Undo a change to btest.cfg from a recent commit
  Updating submodule.
  Fix zeek-wrapper
  Update for renaming BroControl to ZeekControl.
  Updating submodule.
  GH-239: Rename bro to zeek, bro-config to zeek-config, and bro-path-dev to zeek-path-dev.
This commit is contained in:
Jon Siwek 2019-05-14 13:19:12 -07:00
commit 6ad7099f7e
1125 changed files with 1743 additions and 1665 deletions
Download patch file Download diff file Expand all files Collapse all files

16
CHANGES
View file

@ -1,4 +1,20 @@
2.6-286 | 2019-05-14 13:19:12 -0700
* Undo an unintentional change to btest.cfg from a recent commit (Daniel Thayer)
* Fix zeek-wrapper and improve error messages (Daniel Thayer)
The script was not passing command-line arguments to the new program.
* Update for renaming BroControl to ZeekControl. (Robin Sommer, Corelight)
* GH-239: Rename bro to zeek, bro-config to zeek-config, and bro-path-dev to zeek-path-dev.
(Robin Sommer, Corelight)
This also installs symlinks from "zeek" and "bro-config" to a wrapper
script that prints a deprecation warning.
2.6-279 | 2019-05-13 20:02:59 -0700
* GH-365: improve un-indexable type error message (Jon Siwek, Corelight)

47
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)
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
"export BROPATH=`${CMAKE_CURRENT_BINARY_DIR}/bro-path-dev`\n"
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/zeek-path-dev.sh
"export BROPATH=`${CMAKE_CURRENT_BINARY_DIR}/zeek-path-dev`\n"
"export BRO_PLUGIN_PATH=\"${CMAKE_CURRENT_BINARY_DIR}/src\":${BRO_PLUGIN_PATH}\n"
"export PATH=\"${CMAKE_CURRENT_BINARY_DIR}/src\":$PATH\n")
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bro-path-dev.csh
"setenv BROPATH `${CMAKE_CURRENT_BINARY_DIR}/bro-path-dev`\n"
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/zeek-path-dev.csh
"setenv BROPATH `${CMAKE_CURRENT_BINARY_DIR}/zeek-path-dev`\n"
"setenv BRO_PLUGIN_PATH \"${CMAKE_CURRENT_BINARY_DIR}/src\":${BRO_PLUGIN_PATH}\n"
"setenv PATH \"${CMAKE_CURRENT_BINARY_DIR}/src\":$PATH\n")
@ -254,36 +254,43 @@ if ( NOT BINARY_PACKAGING_MODE )
endif ()
string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/bro-config.h.in
${CMAKE_CURRENT_BINARY_DIR}/bro-config.h)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zeek-config.h.in
${CMAKE_CURRENT_BINARY_DIR}/zeek-config.h)
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 )
set(BRO_CONFIG_CAF_ROOT_DIR ${CAF_ROOT_DIR})
set(ZEEK_CONFIG_CAF_ROOT_DIR ${CAF_ROOT_DIR})
else ()
set(BRO_CONFIG_CAF_ROOT_DIR ${BRO_ROOT_DIR})
set(ZEEK_CONFIG_CAF_ROOT_DIR ${BRO_ROOT_DIR})
endif ()
if ( BinPAC_ROOT_DIR )
set(BRO_CONFIG_BINPAC_ROOT_DIR ${BinPAC_ROOT_DIR})
set(ZEEK_CONFIG_BINPAC_ROOT_DIR ${BinPAC_ROOT_DIR})
else ()
set(BRO_CONFIG_BINPAC_ROOT_DIR ${BRO_ROOT_DIR})
set(ZEEK_CONFIG_BINPAC_ROOT_DIR ${BRO_ROOT_DIR})
endif ()
if ( BROKER_ROOT_DIR )
set(BRO_CONFIG_BROKER_ROOT_DIR ${BROKER_ROOT_DIR})
set(ZEEK_CONFIG_BROKER_ROOT_DIR ${BROKER_ROOT_DIR})
else ()
set(BRO_CONFIG_BROKER_ROOT_DIR ${BRO_ROOT_DIR})
set(ZEEK_CONFIG_BROKER_ROOT_DIR ${BRO_ROOT_DIR})
endif ()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/bro-config.in
${CMAKE_CURRENT_BINARY_DIR}/bro-config @ONLY)
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/bro-config DESTINATION bin)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zeek-config.in
${CMAKE_CURRENT_BINARY_DIR}/zeek-config @ONLY)
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/zeek-config DESTINATION bin)
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cmake DESTINATION share/bro
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
@ -324,13 +331,13 @@ add_subdirectory(man)
include(CheckOptionalBuildSources)
CheckOptionalBuildSources(aux/broctl Broctl INSTALL_BROCTL)
CheckOptionalBuildSources(aux/broctl ZeekControl INSTALL_ZEEKCTL)
CheckOptionalBuildSources(aux/bro-aux Bro-Aux INSTALL_AUX_TOOLS)
########################################################################
## Packaging Setup
if (INSTALL_BROCTL)
if (INSTALL_ZEEKCTL)
# CPack RPM Generator may not automatically detect this
set(CPACK_RPM_PACKAGE_REQUIRES "python >= 2.6.0")
endif ()
@ -365,7 +372,7 @@ message(
"\nCXXFLAGS: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${BuildType}}"
"\nCPP: ${CMAKE_CXX_COMPILER}"
"\n"
"\nBroctl: ${INSTALL_BROCTL}"
"\nZeekControl: ${INSTALL_ZEEKCTL}"
"\nAux. Tools: ${INSTALL_AUX_TOOLS}"
"\n"
"\nlibmaxminddb: ${USE_GEOIP}"

19
NEWS
View file

@ -82,6 +82,25 @@ New Functionality
Changed Functionality
---------------------
- The following executable names have changed (the old names will
continue to work, but emit a deprecation warning):
- ``bro`` is now ``zeek``
- ``bro-config`` is now ``zeek-config``
- ``broctl`` is now ``zeekctl``
- ``bro-cut`` is now ``zeek-cut``
- BroControl has been completely renamed to ZeekControl. Many installation
directories and files with "broctl" in their name have been changed
to use "zeekctl" instead. It's expected this has been done in a way
that's backwards compatible with previous Bro installations. E.g.
if you made customizations to the ``broctl.cfg`` file of a previous
installation, installing the newer Zeek version over it will retain that
file and even symlink the new ``zeekctl.cfg`` to it.
- ``$prefix/share/bro/site/local.bro`` has been renamed to
``local.zeek``. If you have a ``local.bro`` file from a previous
installation, possibly with customizations made to it, the new

2
VERSION
View file

@ -1 +1 @@
2.6-279
2.6-286

2
aux/broctl

@ -1 +1 @@
Subproject commit 7731032fe15aa6ff86f3364a6d31c61d15311286
Subproject commit 2ab58cc88fd80f1d7a7fc5dd14bfd63b07f285f6

2
aux/broker

@ -1 +1 @@
Subproject commit 56408c5582c80db6774c8b25642149dfb542345a
Subproject commit bef5e1460a8814b47a3cfc8073eb4be2479e74f6

2
aux/zeek-aux

@ -1 +1 @@
Subproject commit ba482418c4e16551fd7b9128a4082348ef2842f0
Subproject commit 117e8a550de1266e2d50428344caf858aab0485b

18
configure vendored
View file

@ -34,12 +34,12 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
--prefix=PREFIX installation directory [/usr/local/bro]
--scriptdir=PATH root installation directory for Bro scripts
[PREFIX/share/bro]
--localstatedir=PATH when using BroControl, path to store log files
--localstatedir=PATH when using ZeekControl, path to store log files
and run-time data (within log/ and spool/ subdirs)
[PREFIX]
--spooldir=PATH when using BroControl, path to store run-time data
--spooldir=PATH when using ZeekControl, path to store run-time data
[PREFIX/spool]
--logdir=PATH when using BroControl, path to store log file
--logdir=PATH when using ZeekControl, path to store log file
[PREFIX/logs]
--conf-files-dir=PATH config files installation directory [PREFIX/etc]
@ -53,7 +53,7 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
--enable-jemalloc link against jemalloc
--enable-static-broker build broker statically (ignored if --with-broker is specified)
--enable-static-binpac build binpac statically (ignored if --with-binpac is specified)
--disable-broctl don't install Broctl
--disable-zeekctl don't install ZeekControl
--disable-auxtools don't build or install auxiliary tools
--disable-perftools don't try to build with Google Perftools
--disable-python don't try to build python bindings for broker
@ -131,7 +131,7 @@ prefix=/usr/local/bro
CMakeCacheEntries=""
append_cache_entry CMAKE_INSTALL_PREFIX PATH $prefix
append_cache_entry BRO_ROOT_DIR PATH $prefix
append_cache_entry PY_MOD_INSTALL_DIR PATH $prefix/lib/broctl
append_cache_entry PY_MOD_INSTALL_DIR PATH $prefix/lib/zeekctl
append_cache_entry BRO_SCRIPT_INSTALL_PATH STRING $prefix/share/bro
append_cache_entry BRO_ETC_INSTALL_DIR PATH $prefix/etc
append_cache_entry ENABLE_DEBUG BOOL false
@ -140,7 +140,7 @@ append_cache_entry ENABLE_PERFTOOLS_DEBUG BOOL false
append_cache_entry ENABLE_JEMALLOC BOOL false
append_cache_entry BUILD_SHARED_LIBS BOOL true
append_cache_entry INSTALL_AUX_TOOLS BOOL true
append_cache_entry INSTALL_BROCTL BOOL true
append_cache_entry INSTALL_ZEEKCTL BOOL true
append_cache_entry CPACK_SOURCE_IGNORE_FILES STRING
append_cache_entry ENABLE_MOBILE_IPV6 BOOL false
append_cache_entry DISABLE_PERFTOOLS BOOL false
@ -180,7 +180,7 @@ while [ $# -ne 0 ]; do
prefix=$optarg
append_cache_entry CMAKE_INSTALL_PREFIX PATH $optarg
append_cache_entry BRO_ROOT_DIR PATH $optarg
append_cache_entry PY_MOD_INSTALL_DIR PATH $optarg/lib/broctl
append_cache_entry PY_MOD_INSTALL_DIR PATH $optarg/lib/zeekctl
;;
--scriptdir=*)
append_cache_entry BRO_SCRIPT_INSTALL_PATH STRING $optarg
@ -225,8 +225,8 @@ while [ $# -ne 0 ]; do
--enable-static-binpac)
append_cache_entry BUILD_STATIC_BINPAC BOOL true
;;
--disable-broctl)
append_cache_entry INSTALL_BROCTL BOOL false
--disable-zeekctl)
append_cache_entry INSTALL_ZEEKCTL BOOL false
;;
--disable-auxtools)
append_cache_entry INSTALL_AUX_TOOLS BOOL false

2
doc

@ -1 +1 @@
Subproject commit 6eb2d810ad7b2f66f6739bc23dc82ba5d6b27ec1
Subproject commit bafc32a197e77edf1f4ccab654f03476226a8839

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

2
scripts/base/frameworks/cluster/setup-connections.zeek
View file

@ -44,7 +44,7 @@ function connect_peers_with_type(node_type: NodeType)
event zeek_init() &priority=-10
{
if ( getenv("BROCTL_CHECK_CONFIG") != "" )
if ( getenv("ZEEKCTL_CHECK_CONFIG") != "" )
return;
local self = nodes[node];

2
scripts/base/frameworks/control/main.zeek
View file

@ -6,7 +6,7 @@ module Control;
export {
## The topic prefix used for exchanging control messages via Broker.
const topic_prefix = "bro/control";
const topic_prefix = "zeek/control";
## Whether the controllee should call :zeek:see:`Broker::listen`.
## In a cluster, this isn't needed since the setup process calls it.

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
##! 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/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::
##!
##! 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/broker

2
src/Attr.cc
View file

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

2
src/BroString.cc
View file

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

2
src/CCL.cc
View file

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

28
src/CMakeLists.txt
View file

@ -351,24 +351,28 @@ set(bro_SRCS
collect_headers(bro_HEADERS ${bro_SRCS})
if ( bro_HAVE_OBJECT_LIBRARIES )
add_executable(bro ${bro_SRCS} ${bro_HEADERS} ${bro_SUBDIRS})
target_link_libraries(bro ${brodeps} ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
add_executable(zeek ${bro_SRCS} ${bro_HEADERS} ${bro_SUBDIRS})
target_link_libraries(zeek ${brodeps} ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
else ()
add_executable(bro ${bro_SRCS} ${bro_HEADERS})
target_link_libraries(bro ${bro_SUBDIRS} ${brodeps} ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
add_executable(zeek ${bro_SRCS} ${bro_HEADERS})
target_link_libraries(zeek ${bro_SUBDIRS} ${brodeps} ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
endif ()
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 ()
install(TARGETS bro DESTINATION bin)
install(TARGETS zeek DESTINATION bin)
set(BRO_EXE bro
CACHE STRING "Bro executable binary" FORCE)
# Install wrapper script for Bro-to-Zeek renaming.
include(InstallSymlink)
InstallSymlink("${CMAKE_INSTALL_PREFIX}/bin/zeek-wrapper" "${CMAKE_INSTALL_PREFIX}/bin/bro")
set(BRO_EXE_PATH ${CMAKE_CURRENT_BINARY_DIR}/bro
CACHE STRING "Path to Bro executable binary" FORCE)
set(BRO_EXE zeek
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.
add_custom_target(generate_outputs_stage1)
@ -387,12 +391,12 @@ add_dependencies(generate_outputs generate_outputs_stage2a generate_outputs_stag
# Build __load__.zeek files for standard *.bif.zeek.
bro_bif_create_loader(bif_loader "${bro_BASE_BIF_SCRIPTS}")
add_dependencies(bif_loader ${bro_SUBDIRS})
add_dependencies(bro bif_loader)
add_dependencies(zeek bif_loader)
# Build __load__.zeek files for plugins/*.bif.zeek.
bro_bif_create_loader(bif_loader_plugins "${bro_PLUGIN_BIF_SCRIPTS}")
add_dependencies(bif_loader_plugins ${bro_SUBDIRS})
add_dependencies(bro bif_loader_plugins)
add_dependencies(zeek bif_loader_plugins)
# Install *.bif.zeek.
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 "bro-config.h"
#include "zeek-config.h"
#include "ChunkedIO.h"
#include "NetVar.h"

2
src/ChunkedIO.h
View file

@ -3,7 +3,7 @@
#ifndef CHUNKEDIO_H
#define CHUNKEDIO_H
#include "bro-config.h"
#include "zeek-config.h"
#include "List.h"
#include "util.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.
#include "bro-config.h"
#include "zeek-config.h"
#include "CompHash.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.
#include "bro-config.h"
#include "zeek-config.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.
#include "bro-config.h"
#include "zeek-config.h"
#include "EquivClass.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.
#include "bro-config.h"
#include "zeek-config.h"
#include <sys/types.h>
#include <sys/socket.h>

2
src/DbgBreakpoint.cc
View file

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

2
src/DbgHelp.cc
View file

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

2
src/DbgWatch.cc
View file

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

2
src/Debug.cc
View file

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

2
src/DebugCmds.cc
View file

@ -1,7 +1,7 @@
// Support routines to help deal with Bro debugging commands and
// implementation of most commands.
#include "bro-config.h"
#include "zeek-config.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.
#include "bro-config.h"
#include "zeek-config.h"
#include <stdlib.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.
#include "bro-config.h"
#include "zeek-config.h"
#ifdef HAVE_MEMORY_H
#include <memory.h>

2
src/Discard.cc
View file

@ -2,7 +2,7 @@
#include <algorithm>
#include "bro-config.h"
#include "zeek-config.h"
#include "Net.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.
#include "bro-config.h"
#include "zeek-config.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.
#include "bro-config.h"
#include "zeek-config.h"
#include "Event.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.
#include "bro-config.h"
#include "zeek-config.h"
#include "Expr.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.
#include "bro-config.h"
#include "zeek-config.h"
#include <sys/types.h>
#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.
#include "bro-config.h"
#include "zeek-config.h"
#include "util.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.
#include "bro-config.h"
#include "zeek-config.h"
#include "Frame.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.
#include "bro-config.h"
#include "zeek-config.h"
#include <sys/types.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
// HMAC/MD5 is provably universal.
#include "bro-config.h"
#include "zeek-config.h"
#include "Hash.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.
#include "bro-config.h"
#include "zeek-config.h"
#include "ID.h"
#include "Expr.h"

2
src/IP.h
View file

@ -3,7 +3,7 @@
#ifndef ip_h
#define ip_h
#include "bro-config.h"
#include "zeek-config.h"
#include "net_util.h"
#include "IPAddr.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
#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 <stdlib.h>

2
src/NFA.cc
View file

@ -1,6 +1,6 @@
// See the file "COPYING" in the main distribution directory for copyright.
#include "bro-config.h"
#include "zeek-config.h"
#include "NFA.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.
#include "bro-config.h"
#include "zeek-config.h"
#include <sys/types.h>
#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.
#include "bro-config.h"
#include "zeek-config.h"
#include "Var.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.
#include "bro-config.h"
#include "zeek-config.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.
#include "bro-config.h"
#include "zeek-config.h"
#include <assert.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/stat.h>

2
src/PriorityQueue.cc
View file

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

2
src/Reassem.cc
View file

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

2
src/Reporter.cc
View file

@ -4,7 +4,7 @@
#include <syslog.h>
#include "bro-config.h"
#include "zeek-config.h"
#include "Reporter.h"
#include "Event.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 "RuleMatcher.h"

2
src/RuleAction.cc
View file

@ -1,7 +1,7 @@
#include <string>
using std::string;
#include "bro-config.h"
#include "zeek-config.h"
#include "RuleAction.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 "analyzer/protocol/tcp/TCP.h"

2
src/RuleMatcher.cc
View file

@ -1,7 +1,7 @@
#include <algorithm>
#include <functional>
#include "bro-config.h"
#include "zeek-config.h"
#include "analyzer/Analyzer.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.
#include "bro-config.h"
#include "zeek-config.h"
#include "ID.h"
#include "Val.h"

2
src/SerialObj.h
View file

@ -37,7 +37,7 @@
#include "DebugLogger.h"
#include "Continuation.h"
#include "SerialTypes.h"
#include "bro-config.h"
#include "zeek-config.h"
#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.)"

2
src/Sessions.cc
View file

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

2
src/Stmt.cc
View file

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

2
src/Tag.h
View file

@ -3,7 +3,7 @@
#ifndef TAG_H
#define TAG_H
#include "bro-config.h"
#include "zeek-config.h"
#include "util.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.
#include "bro-config.h"
#include "zeek-config.h"
#include "util.h"
#include "Timer.h"

2
src/TunnelEncapsulation.h
View file

@ -3,7 +3,7 @@
#ifndef TUNNELS_H
#define TUNNELS_H
#include "bro-config.h"
#include "zeek-config.h"
#include "NetVar.h"
#include "IPAddr.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.
#include "bro-config.h"
#include "zeek-config.h"
#include "Type.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.
#include "bro-config.h"
#include "zeek-config.h"
#include <sys/types.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.
#include "bro-config.h"
#include "zeek-config.h"
#include "Var.h"
#include "Func.h"

2
src/analyzer/Component.h
View file

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

2
src/analyzer/Tag.h
View file

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

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

@ -3,7 +3,7 @@
#ifndef 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/socket.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.
#include "bro-config.h"
#include "zeek-config.h"
#include "BackDoor.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.
#include "bro-config.h"
#include "zeek-config.h"
#include <stdlib.h>
#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.
#include "bro-config.h"
#include "zeek-config.h"
#include <ctype.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.
#include "bro-config.h"
#include "zeek-config.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.
#include "bro-config.h"
#include "zeek-config.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.
#include "bro-config.h"
#include "zeek-config.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.
#include "bro-config.h"
#include "zeek-config.h"
#include <ctype.h>
#include <math.h>

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

@ -2,7 +2,7 @@
#include <algorithm>
#include "bro-config.h"
#include "zeek-config.h"
#include "Net.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.
#include "bro-config.h"
#include "zeek-config.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.
#include "bro-config.h"
#include "zeek-config.h"
#include "InterConn.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.
#include "bro-config.h"
#include "zeek-config.h"
#include <ctype.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.
#include "bro-config.h"
#include "zeek-config.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.
#include "bro-config.h"
#include "zeek-config.h"
#include "NetVar.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.
#include "bro-config.h"
#include "zeek-config.h"
#include "NetVar.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.
#include "bro-config.h"
#include "zeek-config.h"
#include "Telnet.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 "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.
#include "bro-config.h"
#include "zeek-config.h"
#include <stdlib.h>
#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.
#include "bro-config.h"
#include "zeek-config.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.
#include "bro-config.h"
#include "zeek-config.h"
#include "NetVar.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
// Robin Sommer.
#include "bro-config.h"
#include "zeek-config.h"
#include <stdlib.h>
#include <iostream>

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

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

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

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

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

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

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

@ -2,7 +2,7 @@
#include <algorithm>
#include "bro-config.h"
#include "zeek-config.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.
#include "bro-config.h"
#include "zeek-config.h"
#include <stdlib.h>

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