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

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

CMakeLists.txt

@@ -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
 

doc

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

scripts/policy/frameworks/control/controllee.zeek

@@ -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

scripts/policy/frameworks/control/controller.zeek

@@ -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

src/Attr.cc

@@ -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"

src/Base64.cc

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

src/BroString.cc

@@ -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>

src/CCL.cc

@@ -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"

src/CMakeLists.txt

@@ -353,24 +353,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)
@@ -389,12 +393,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)

src/ChunkedIO.cc

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

src/ChunkedIO.h

@@ -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"

src/CompHash.cc

@@ -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"

src/Conn.cc

@@ -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>
 

src/DFA.cc

@@ -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"

src/DNS_Mgr.cc

@@ -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>

src/DbgBreakpoint.cc

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

src/DbgHelp.cc

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

src/DbgWatch.cc

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

src/Debug.cc

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

src/DebugCmds.cc

@@ -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>
 

src/Desc.cc

@@ -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>

src/Dict.cc

@@ -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>

src/Discard.cc

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

src/EquivClass.cc

@@ -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"
 

src/Event.cc

@@ -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"

src/Expr.cc

@@ -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"

src/File.cc

@@ -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

src/Frag.cc

@@ -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"

src/Frame.cc

@@ -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"

src/Func.cc

@@ -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>

src/Hash.cc

@@ -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"

src/ID.cc

@@ -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"

src/IP.h

@@ -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"

src/IntSet.cc

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

src/List.cc

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

src/NFA.cc

@@ -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"

src/Net.cc

@@ -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

src/NetVar.cc

@@ -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"

src/Obj.cc

@@ -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>
 

src/PacketDumper.cc

@@ -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>

src/PolicyFile.cc

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

src/PriorityQueue.cc

@@ -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>

src/Queue.cc

@@ -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>
 

src/RE.cc

@@ -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>

src/Reassem.cc

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

src/RemoteSerializer.cc

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

src/Reporter.cc

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

src/Rule.cc

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

src/RuleAction.cc

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

src/RuleCondition.cc

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

src/RuleMatcher.cc

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

src/Scope.cc

@@ -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"

src/SerialObj.h

@@ -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.)"

src/Sessions.cc

@@ -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>
 

src/SmithWaterman.cc

@@ -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>

src/Stmt.cc

@@ -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"

src/Tag.h

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

src/Timer.cc

@@ -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"

src/TunnelEncapsulation.h

@@ -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"

src/Type.cc

@@ -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"

src/Val.cc

@@ -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>

src/Var.cc

@@ -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"

src/analyzer/Component.h

@@ -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;

src/analyzer/Tag.h

@@ -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"

src/analyzer/protocol/arp/ARP.h

@@ -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>

src/analyzer/protocol/backdoor/BackDoor.cc

@@ -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"

src/analyzer/protocol/dce-rpc/DCE_RPC.cc

@@ -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>

src/analyzer/protocol/dns/DNS.cc

@@ -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>

src/analyzer/protocol/finger/Finger.cc

@@ -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>
 

src/analyzer/protocol/ftp/FTP.cc

@@ -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>
 

src/analyzer/protocol/gnutella/Gnutella.cc

@@ -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>
 

src/analyzer/protocol/http/HTTP.cc

@@ -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>

src/analyzer/protocol/icmp/ICMP.cc

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

src/analyzer/protocol/ident/Ident.cc

@@ -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>
 

src/analyzer/protocol/interconn/InterConn.cc

@@ -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"

src/analyzer/protocol/login/Login.cc

@@ -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>

src/analyzer/protocol/login/NVT.cc

@@ -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>
 

src/analyzer/protocol/login/RSH.cc

@@ -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"

src/analyzer/protocol/login/Rlogin.cc

@@ -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"

src/analyzer/protocol/login/Telnet.cc

@@ -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"

src/analyzer/protocol/mime/MIME.cc

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

src/analyzer/protocol/ncp/NCP.cc

@@ -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>

src/analyzer/protocol/netbios/NetbiosSSN.cc

@@ -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>
 

src/analyzer/protocol/ntp/NTP.cc

@@ -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"

src/analyzer/protocol/pop3/POP3.cc

@@ -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>

src/analyzer/protocol/rpc/MOUNT.cc

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

src/analyzer/protocol/rpc/NFS.cc

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

src/analyzer/protocol/rpc/Portmap.cc

@@ -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"

src/analyzer/protocol/rpc/RPC.cc

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

src/analyzer/protocol/rpc/XDR.cc

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

src/analyzer/protocol/smtp/SMTP.cc

@@ -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>
 

src/analyzer/protocol/stepping-stone/SteppingStone.cc

@@ -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>
 

src/analyzer/protocol/udp/UDP.cc

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

src/analyzer/protocol/zip/ZIP.h

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

src/bsd-getopt-long.c

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

src/file_analysis/Component.h

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

src/file_analysis/Tag.h

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

src/input/Tag.h

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

src/input/readers/sqlite/SQLite.cc

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