diff --git a/CHANGES b/CHANGES index a23d6a2fee..a3c632840c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,12 @@ +2.4-63 | 2015-07-28 12:26:37 -0700 + + * Updating submodule(s). + +2.4-61 | 2015-07-28 12:13:39 -0700 + + * Renaming config.h to bro-config.h. (Robin Sommer) + 2.4-58 | 2015-07-24 15:06:07 -0700 * Add script protocols/conn/vlan-logging.bro to record VLAN data in diff --git a/CMakeLists.txt b/CMakeLists.txt index 30e1a4a545..7dbf8109ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -170,8 +170,8 @@ include(RequireCXX11) # Tell the plugin code that we're building as part of the main tree. set(BRO_PLUGIN_INTERNAL_BUILD true CACHE INTERNAL "" FORCE) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in - ${CMAKE_CURRENT_BINARY_DIR}/config.h) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/bro-config.h.in + ${CMAKE_CURRENT_BINARY_DIR}/bro-config.h) include_directories(${CMAKE_CURRENT_BINARY_DIR}) diff --git a/NEWS b/NEWS index 3e35d6f492..071677010f 100644 --- a/NEWS +++ b/NEWS @@ -26,6 +26,10 @@ New Functionality information. Use with care, generating events per packet is expensive. +- New Bro plugins in aux/plugins: + + - pf_ring: Native PF_RING support. + Bro 2.4 ======= diff --git a/VERSION b/VERSION index b85c5a6f78..c1db379cbf 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4-58 +2.4-63 diff --git a/aux/broctl b/aux/broctl index 4ec6cb683d..94eee5b76e 160000 --- a/aux/broctl +++ b/aux/broctl @@ -1 +1 @@ -Subproject commit 4ec6cb683d4477a0e5acb23e8eb0d0469c8a4166 +Subproject commit 94eee5b76e0ec78fb646e3a340c558dfe3026b14 diff --git a/aux/plugins b/aux/plugins index 98ad8a5b97..2799b2a135 160000 --- a/aux/plugins +++ b/aux/plugins @@ -1 +1 @@ -Subproject commit 98ad8a5b97f601a3ec9a773d87582438212b8290 +Subproject commit 2799b2a13577fc70eea1da6192879a25c58902de diff --git a/config.h.in b/config.h.in deleted file mode 100644 index 755a9eee98..0000000000 --- a/config.h.in +++ /dev/null @@ -1,225 +0,0 @@ -/* Old libpcap versions (< 0.6.1) need defining pcap_freecode and - pcap_compile_nopcap */ -#cmakedefine DONT_HAVE_LIBPCAP_PCAP_FREECODE - -/* should explicitly declare socket() and friends */ -#cmakedefine DO_SOCK_DECL - -/* Define if you have the header file. */ -#cmakedefine HAVE_GETOPT_H - -/* Define if you have the `getopt_long' function. */ -#cmakedefine HAVE_GETOPT_LONG - -/* We are on a Linux system */ -#cmakedefine HAVE_LINUX - -/* Define if you have the `mallinfo' function. */ -#cmakedefine HAVE_MALLINFO - -/* Define if you have the header file. */ -#cmakedefine HAVE_MEMORY_H - -/* Define if you have the header file. */ -#cmakedefine HAVE_NETINET_IF_ETHER_H - -/* Define if you have the header file. */ -#cmakedefine HAVE_NETINET_IP6_H - -/* Define if you have the header file. */ -#cmakedefine HAVE_NET_ETHERNET_H - -/* Define if you have the header file. */ -#cmakedefine HAVE_NET_ETHERTYPES_H - -/* have os-proto.h */ -#cmakedefine HAVE_OS_PROTO_H - -/* Define if you have the header file. */ -#cmakedefine HAVE_PCAP_INT_H - -/* line editing & history powers */ -#cmakedefine HAVE_READLINE - -/* Define if you have the `sigaction' function, but not `sigset'. */ -#cmakedefine HAVE_SIGACTION - -/* Define if you have the `sigset' function. */ -#cmakedefine HAVE_SIGSET - -/* Define if you have the `strcasestr' function. */ -#cmakedefine HAVE_STRCASESTR - -/* Define if you have the `strerror' function. */ -#cmakedefine HAVE_STRERROR - -/* Define if you have the `strsep' function. */ -#cmakedefine HAVE_STRSEP - -/* Define if you have the header file. */ -#cmakedefine HAVE_SYS_ETHERNET_H - -/* Some libpcap versions use an extra parameter (error) in pcap_compile_nopcap - */ -#cmakedefine LIBPCAP_PCAP_COMPILE_NOPCAP_HAS_ERROR_PARAMETER - -/* Include krb5.h */ -#cmakedefine NEED_KRB5_H - -/* Compatibility for Darwin */ -#cmakedefine NEED_NAMESER_COMPAT_H - -/* d2i_x509 uses const char** */ -#cmakedefine OPENSSL_D2I_X509_USES_CONST_CHAR - -/* Define as the return type of signal handlers (`int' or `void'). */ -#define RETSIGTYPE @RETSIGTYPE@ - -/* signal function return value */ -#define RETSIGVAL @RETSIGVAL@ - -/* have sin_len field in sockaddr_in */ -#cmakedefine SIN_LEN - -/* The size of `long int', as computed by sizeof. */ -#define SIZEOF_LONG_INT @SIZEOF_LONG_INT@ - -/* The size of `long long', as computed by sizeof. */ -#define SIZEOF_LONG_LONG @SIZEOF_LONG_LONG@ - -/* The size of `void *', as computed by sizeof. */ -#define SIZEOF_VOID_P @SIZEOF_VOID_P@ - -/* should we declare syslog() and openlog() */ -#cmakedefine SYSLOG_INT - -/* Define if you have */ -#cmakedefine HAVE_SYS_TIME_H - -/* Define if you can safely include both and . */ -#cmakedefine TIME_WITH_SYS_TIME - -/* GeoIP geographic lookup functionality */ -#cmakedefine USE_GEOIP - -/* Whether the found GeoIP API supports IPv6 Country Edition */ -#cmakedefine HAVE_GEOIP_COUNTRY_EDITION_V6 - -/* Whether the found GeoIP API supports IPv6 City Edition */ -#cmakedefine HAVE_GEOIP_CITY_EDITION_REV0_V6 - -/* Use Google's perftools */ -#cmakedefine USE_PERFTOOLS_DEBUG - -/* Analyze Mobile IPv6 traffic */ -#cmakedefine ENABLE_MOBILE_IPV6 - -/* Use libCurl. */ -#cmakedefine USE_CURL - -/* Use the DataSeries writer. */ -#cmakedefine USE_DATASERIES - -/* Use the ElasticSearch writer. */ -#cmakedefine USE_ELASTICSEARCH - -/* Version number of package */ -#define VERSION "@VERSION@" - -/* whether words are stored with the most significant byte first */ -#cmakedefine WORDS_BIGENDIAN - -/* whether htonll/ntohll is defined in */ -#cmakedefine HAVE_BYTEORDER_64 - -/* ultrix can't hack const */ -#cmakedefine NEED_ULTRIX_CONST_HACK -#ifdef NEED_ULTRIX_CONST_HACK -#define const -#endif - -/* Define int32_t */ -#cmakedefine int32_t @int32_t@ - -/* use sigset() instead of signal() */ -#ifdef HAVE_SIGSET -#define signal sigset -#endif - -/* define to int if socklen_t not available */ -#cmakedefine socklen_t @socklen_t@ - -/* Define u_int16_t */ -#cmakedefine u_int16_t @u_int16_t@ - -/* Define u_int32_t */ -#cmakedefine u_int32_t @u_int32_t@ - -/* Define u_int8_t */ -#cmakedefine u_int8_t @u_int8_t@ - -/* OpenBSD's bpf.h may not declare this data link type, but it's supposed to be - used consistently for the same purpose on all platforms. */ -#cmakedefine HAVE_DLT_PPP_SERIAL -#ifndef HAVE_DLT_PPP_SERIAL -#define DLT_PPP_SERIAL @DLT_PPP_SERIAL@ -#endif - -/* IPv6 Next Header values defined by RFC 3542 */ -#cmakedefine HAVE_IPPROTO_HOPOPTS -#ifndef HAVE_IPPROTO_HOPOPTS -#define IPPROTO_HOPOPTS 0 -#endif -#cmakedefine HAVE_IPPROTO_IPV6 -#ifndef HAVE_IPPROTO_IPV6 -#define IPPROTO_IPV6 41 -#endif -#cmakedefine HAVE_IPPROTO_IPV4 -#ifndef HAVE_IPPROTO_IPV4 -#define IPPROTO_IPV4 4 -#endif -#cmakedefine HAVE_IPPROTO_ROUTING -#ifndef HAVE_IPPROTO_ROUTING -#define IPPROTO_ROUTING 43 -#endif -#cmakedefine HAVE_IPPROTO_FRAGMENT -#ifndef HAVE_IPPROTO_FRAGMENT -#define IPPROTO_FRAGMENT 44 -#endif -#cmakedefine HAVE_IPPROTO_ESP -#ifndef HAVE_IPPROTO_ESP -#define IPPROTO_ESP 50 -#endif -#cmakedefine HAVE_IPPROTO_AH -#ifndef HAVE_IPPROTO_AH -#define IPPROTO_AH 51 -#endif -#cmakedefine HAVE_IPPROTO_ICMPV6 -#ifndef HAVE_IPPROTO_ICMPV6 -#define IPPROTO_ICMPV6 58 -#endif -#cmakedefine HAVE_IPPROTO_NONE -#ifndef HAVE_IPPROTO_NONE -#define IPPROTO_NONE 59 -#endif -#cmakedefine HAVE_IPPROTO_DSTOPTS -#ifndef HAVE_IPPROTO_DSTOPTS -#define IPPROTO_DSTOPTS 60 -#endif - -/* IPv6 options structure defined by RFC 3542 */ -#cmakedefine HAVE_IP6_OPT - -/* Common IPv6 extension structure */ -#cmakedefine HAVE_IP6_EXT - -/* String with host architecture (e.g., "linux-x86_64") */ -#define HOST_ARCHITECTURE "@HOST_ARCHITECTURE@" - -/* String with extension of dynamic libraries (e.g., ".so") */ -#define DYNAMIC_PLUGIN_SUFFIX "@CMAKE_SHARED_MODULE_SUFFIX@" - -/* True if we're building outside of the main Bro source code tree. */ -#ifndef BRO_PLUGIN_INTERNAL_BUILD -#define BRO_PLUGIN_INTERNAL_BUILD @BRO_PLUGIN_INTERNAL_BUILD@ -#endif diff --git a/src/Attr.cc b/src/Attr.cc index dad51c608e..4bfbcf2ad7 100644 --- a/src/Attr.cc +++ b/src/Attr.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include "Attr.h" #include "Expr.h" diff --git a/src/Base64.cc b/src/Base64.cc index e76621e634..2ff858cad5 100644 --- a/src/Base64.cc +++ b/src/Base64.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "bro-config.h" #include "Base64.h" #include diff --git a/src/BroString.cc b/src/BroString.cc index 086a7f8dde..c86e14cf37 100644 --- a/src/BroString.cc +++ b/src/BroString.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include #include diff --git a/src/CCL.cc b/src/CCL.cc index 6c4ec5ea2e..a725257c75 100644 --- a/src/CCL.cc +++ b/src/CCL.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include "CCL.h" #include "RE.h" diff --git a/src/ChunkedIO.cc b/src/ChunkedIO.cc index 1e581806d6..4c43ea5bfa 100644 --- a/src/ChunkedIO.cc +++ b/src/ChunkedIO.cc @@ -9,7 +9,7 @@ #include -#include "config.h" +#include "bro-config.h" #include "ChunkedIO.h" #include "NetVar.h" #include "RemoteSerializer.h" diff --git a/src/ChunkedIO.h b/src/ChunkedIO.h index afb239b325..238bea5044 100644 --- a/src/ChunkedIO.h +++ b/src/ChunkedIO.h @@ -3,7 +3,7 @@ #ifndef CHUNKEDIO_H #define CHUNKEDIO_H -#include "config.h" +#include "bro-config.h" #include "List.h" #include "util.h" #include "Flare.h" diff --git a/src/CompHash.cc b/src/CompHash.cc index 5a972f6016..2e28bff78e 100644 --- a/src/CompHash.cc +++ b/src/CompHash.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include "CompHash.h" #include "Val.h" diff --git a/src/Conn.cc b/src/Conn.cc index 47bd2b5a34..3f6757d89c 100644 --- a/src/Conn.cc +++ b/src/Conn.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include diff --git a/src/DFA.cc b/src/DFA.cc index 514183165a..e7b2279ed5 100644 --- a/src/DFA.cc +++ b/src/DFA.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include diff --git a/src/DNS_Mgr.cc b/src/DNS_Mgr.cc index 99947e3531..7040b9a882 100644 --- a/src/DNS_Mgr.cc +++ b/src/DNS_Mgr.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include #include diff --git a/src/DbgBreakpoint.cc b/src/DbgBreakpoint.cc index 9000d89077..c573a8d3b8 100644 --- a/src/DbgBreakpoint.cc +++ b/src/DbgBreakpoint.cc @@ -1,6 +1,6 @@ // Implementation of breakpoints. -#include "config.h" +#include "bro-config.h" #include diff --git a/src/DbgHelp.cc b/src/DbgHelp.cc index accf7ce6f6..6bbf9c6ecb 100644 --- a/src/DbgHelp.cc +++ b/src/DbgHelp.cc @@ -1,5 +1,5 @@ // Bro Debugger Help -#include "config.h" +#include "bro-config.h" #include "Debug.h" diff --git a/src/DbgWatch.cc b/src/DbgWatch.cc index 74ac26cb73..c34144dc1f 100644 --- a/src/DbgWatch.cc +++ b/src/DbgWatch.cc @@ -1,6 +1,6 @@ // Implementation of watches -#include "config.h" +#include "bro-config.h" #include "Debug.h" #include "DbgWatch.h" diff --git a/src/Debug.cc b/src/Debug.cc index 09e8810edb..7f1250cf49 100644 --- a/src/Debug.cc +++ b/src/Debug.cc @@ -1,6 +1,6 @@ // Debugging support for Bro policy files. -#include "config.h" +#include "bro-config.h" #include #include diff --git a/src/DebugCmds.cc b/src/DebugCmds.cc index bfb4d6ecc8..4e856b00f5 100644 --- a/src/DebugCmds.cc +++ b/src/DebugCmds.cc @@ -1,7 +1,7 @@ // Support routines to help deal with Bro debugging commands and // implementation of most commands. -#include "config.h" +#include "bro-config.h" #include diff --git a/src/Desc.cc b/src/Desc.cc index ebe5fb616c..3cdc35bfe5 100644 --- a/src/Desc.cc +++ b/src/Desc.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include #include diff --git a/src/Dict.cc b/src/Dict.cc index cd7792b539..1d32eccde3 100644 --- a/src/Dict.cc +++ b/src/Dict.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #ifdef HAVE_MEMORY_H #include diff --git a/src/Discard.cc b/src/Discard.cc index edfeea1408..2a20c897aa 100644 --- a/src/Discard.cc +++ b/src/Discard.cc @@ -2,7 +2,7 @@ #include -#include "config.h" +#include "bro-config.h" #include "Net.h" #include "Var.h" diff --git a/src/EquivClass.cc b/src/EquivClass.cc index 6ab667b146..7f54f07060 100644 --- a/src/EquivClass.cc +++ b/src/EquivClass.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include "EquivClass.h" diff --git a/src/Event.cc b/src/Event.cc index 82ea80988e..89e745361f 100644 --- a/src/Event.cc +++ b/src/Event.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include "Event.h" #include "Func.h" diff --git a/src/Expr.cc b/src/Expr.cc index ba44149ec3..9927ca52ec 100644 --- a/src/Expr.cc +++ b/src/Expr.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include "Expr.h" #include "Event.h" diff --git a/src/File.cc b/src/File.cc index e62ca732cd..16d4259fe5 100644 --- a/src/File.cc +++ b/src/File.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include #ifdef TIME_WITH_SYS_TIME diff --git a/src/Frag.cc b/src/Frag.cc index 8ada148750..6a8b901a73 100644 --- a/src/Frag.cc +++ b/src/Frag.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include "util.h" #include "Hash.h" diff --git a/src/Frame.cc b/src/Frame.cc index 8754c02a9f..e97b948dbe 100644 --- a/src/Frame.cc +++ b/src/Frame.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include "Frame.h" #include "Stmt.h" diff --git a/src/Func.cc b/src/Func.cc index 82f73e1f19..e1eadb8c9f 100644 --- a/src/Func.cc +++ b/src/Func.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include #include diff --git a/src/Hash.cc b/src/Hash.cc index 7873e398c3..d723601635 100644 --- a/src/Hash.cc +++ b/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 "config.h" +#include "bro-config.h" #include "Hash.h" diff --git a/src/ID.cc b/src/ID.cc index a308ffa81d..efc488449b 100644 --- a/src/ID.cc +++ b/src/ID.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include "ID.h" #include "Expr.h" diff --git a/src/IP.h b/src/IP.h index bfd3ce8a41..8be2d3e609 100644 --- a/src/IP.h +++ b/src/IP.h @@ -3,7 +3,7 @@ #ifndef ip_h #define ip_h -#include "config.h" +#include "bro-config.h" #include "net_util.h" #include "IPAddr.h" #include "Reporter.h" diff --git a/src/IntSet.cc b/src/IntSet.cc index fb198f0e25..f5b004666c 100644 --- a/src/IntSet.cc +++ b/src/IntSet.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "bro-config.h" #ifdef HAVE_MEMORY_H #include diff --git a/src/List.cc b/src/List.cc index 9a1af3fe4f..a2b4609975 100644 --- a/src/List.cc +++ b/src/List.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "bro-config.h" #include #include diff --git a/src/NFA.cc b/src/NFA.cc index 4849755941..def04d79a1 100644 --- a/src/NFA.cc +++ b/src/NFA.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include "NFA.h" #include "EquivClass.h" diff --git a/src/Net.cc b/src/Net.cc index 2a368c47ef..0b0491719f 100644 --- a/src/Net.cc +++ b/src/Net.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include #ifdef TIME_WITH_SYS_TIME diff --git a/src/NetVar.cc b/src/NetVar.cc index 5585cf8211..8a901842fd 100644 --- a/src/NetVar.cc +++ b/src/NetVar.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include "Var.h" #include "NetVar.h" diff --git a/src/Obj.cc b/src/Obj.cc index 99ddb1329c..5553674598 100644 --- a/src/Obj.cc +++ b/src/Obj.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include diff --git a/src/PacketDumper.cc b/src/PacketDumper.cc index 84b22ff17c..1a53550dfd 100644 --- a/src/PacketDumper.cc +++ b/src/PacketDumper.cc @@ -1,7 +1,7 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include #include diff --git a/src/PolicyFile.cc b/src/PolicyFile.cc index 5d0082c6a9..bd41c15e9d 100644 --- a/src/PolicyFile.cc +++ b/src/PolicyFile.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "bro-config.h" #include #include diff --git a/src/PriorityQueue.cc b/src/PriorityQueue.cc index 8db161b10a..75b731142e 100644 --- a/src/PriorityQueue.cc +++ b/src/PriorityQueue.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include #include diff --git a/src/Queue.cc b/src/Queue.cc index 28bcb92405..587e37063f 100644 --- a/src/Queue.cc +++ b/src/Queue.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include diff --git a/src/RE.cc b/src/RE.cc index f52eff47eb..6c1e80588f 100644 --- a/src/RE.cc +++ b/src/RE.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include #include diff --git a/src/Reassem.cc b/src/Reassem.cc index bfac7f7a07..54f27bd895 100644 --- a/src/Reassem.cc +++ b/src/Reassem.cc @@ -2,7 +2,7 @@ #include -#include "config.h" +#include "bro-config.h" #include "Reassem.h" #include "Serializer.h" diff --git a/src/RemoteSerializer.cc b/src/RemoteSerializer.cc index 44ec678a0f..5113670e78 100644 --- a/src/RemoteSerializer.cc +++ b/src/RemoteSerializer.cc @@ -159,7 +159,7 @@ #include #include -#include "config.h" +#include "bro-config.h" #ifdef TIME_WITH_SYS_TIME # include # include diff --git a/src/Reporter.cc b/src/Reporter.cc index cd1aa09d4c..72c9e9868c 100644 --- a/src/Reporter.cc +++ b/src/Reporter.cc @@ -4,7 +4,7 @@ #include -#include "config.h" +#include "bro-config.h" #include "Reporter.h" #include "Event.h" #include "NetVar.h" diff --git a/src/Rule.cc b/src/Rule.cc index c978b93177..c483527c63 100644 --- a/src/Rule.cc +++ b/src/Rule.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "bro-config.h" #include "Rule.h" #include "RuleMatcher.h" diff --git a/src/RuleAction.cc b/src/RuleAction.cc index a0f4e89010..bac38a1236 100644 --- a/src/RuleAction.cc +++ b/src/RuleAction.cc @@ -1,7 +1,7 @@ #include using std::string; -#include "config.h" +#include "bro-config.h" #include "RuleAction.h" #include "RuleMatcher.h" diff --git a/src/RuleCondition.cc b/src/RuleCondition.cc index 36d8cba39d..68eb13121f 100644 --- a/src/RuleCondition.cc +++ b/src/RuleCondition.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "bro-config.h" #include "RuleCondition.h" #include "analyzer/protocol/tcp/TCP.h" diff --git a/src/RuleMatcher.cc b/src/RuleMatcher.cc index 967c4e4e65..f40a5c4349 100644 --- a/src/RuleMatcher.cc +++ b/src/RuleMatcher.cc @@ -1,7 +1,7 @@ #include #include -#include "config.h" +#include "bro-config.h" #include "analyzer/Analyzer.h" #include "RuleMatcher.h" diff --git a/src/Scope.cc b/src/Scope.cc index 4916cdbfce..091dbabb9b 100644 --- a/src/Scope.cc +++ b/src/Scope.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include "ID.h" #include "Val.h" diff --git a/src/SerialObj.h b/src/SerialObj.h index 4794f2bf20..54929a6b3f 100644 --- a/src/SerialObj.h +++ b/src/SerialObj.h @@ -37,7 +37,7 @@ #include "DebugLogger.h" #include "Continuation.h" #include "SerialTypes.h" -#include "config.h" +#include "bro-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.)" diff --git a/src/Sessions.cc b/src/Sessions.cc index daa0a4d65e..b8bfe82b34 100644 --- a/src/Sessions.cc +++ b/src/Sessions.cc @@ -1,7 +1,7 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include diff --git a/src/SmithWaterman.cc b/src/SmithWaterman.cc index 5f2786caa0..ae57bab00c 100644 --- a/src/SmithWaterman.cc +++ b/src/SmithWaterman.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include #include diff --git a/src/Stmt.cc b/src/Stmt.cc index 932943803c..1cd1e2510a 100644 --- a/src/Stmt.cc +++ b/src/Stmt.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include "Expr.h" #include "Event.h" diff --git a/src/Tag.h b/src/Tag.h index 2c76f253a5..a3d7197fa0 100644 --- a/src/Tag.h +++ b/src/Tag.h @@ -3,7 +3,7 @@ #ifndef TAG_H #define TAG_H -#include "config.h" +#include "bro-config.h" #include "util.h" #include "Type.h" diff --git a/src/Timer.cc b/src/Timer.cc index b8871ee489..f4370ed735 100644 --- a/src/Timer.cc +++ b/src/Timer.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include "util.h" #include "Timer.h" diff --git a/src/TunnelEncapsulation.h b/src/TunnelEncapsulation.h index 419a3000b4..b853fc01b3 100644 --- a/src/TunnelEncapsulation.h +++ b/src/TunnelEncapsulation.h @@ -3,7 +3,7 @@ #ifndef TUNNELS_H #define TUNNELS_H -#include "config.h" +#include "bro-config.h" #include "NetVar.h" #include "IPAddr.h" #include "Val.h" diff --git a/src/Type.cc b/src/Type.cc index 7fab05673f..75f1f445df 100644 --- a/src/Type.cc +++ b/src/Type.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include "Type.h" #include "Attr.h" diff --git a/src/Val.cc b/src/Val.cc index f3825dc9da..01a849c639 100644 --- a/src/Val.cc +++ b/src/Val.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include #include diff --git a/src/Var.cc b/src/Var.cc index ed0f486875..e923e2ec37 100644 --- a/src/Var.cc +++ b/src/Var.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include "Var.h" #include "Func.h" diff --git a/src/analyzer/Component.h b/src/analyzer/Component.h index f538c17919..0704852145 100644 --- a/src/analyzer/Component.h +++ b/src/analyzer/Component.h @@ -7,7 +7,7 @@ #include "plugin/Component.h" #include "plugin/TaggedComponent.h" -#include "../config.h" +#include "../bro-config.h" #include "../util.h" class Connection; diff --git a/src/analyzer/Tag.h b/src/analyzer/Tag.h index d01c8902ee..9ba04b2ef8 100644 --- a/src/analyzer/Tag.h +++ b/src/analyzer/Tag.h @@ -3,7 +3,7 @@ #ifndef ANALYZER_TAG_H #define ANALYZER_TAG_H -#include "config.h" +#include "bro-config.h" #include "util.h" #include "../Tag.h" #include "plugin/TaggedComponent.h" diff --git a/src/analyzer/protocol/arp/ARP.h b/src/analyzer/protocol/arp/ARP.h index 1778f5e200..c4deddee03 100644 --- a/src/analyzer/protocol/arp/ARP.h +++ b/src/analyzer/protocol/arp/ARP.h @@ -3,7 +3,7 @@ #ifndef ANALYZER_PROTOCOL_ARP_ARP_H #define ANALYZER_PROTOCOL_ARP_ARP_H -#include "config.h" +#include "bro-config.h" #include #include #include diff --git a/src/analyzer/protocol/backdoor/BackDoor.cc b/src/analyzer/protocol/backdoor/BackDoor.cc index 984b2a5dcf..4119b66121 100644 --- a/src/analyzer/protocol/backdoor/BackDoor.cc +++ b/src/analyzer/protocol/backdoor/BackDoor.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include "BackDoor.h" #include "Event.h" diff --git a/src/analyzer/protocol/dce-rpc/DCE_RPC.cc b/src/analyzer/protocol/dce-rpc/DCE_RPC.cc index dd31cfa8a7..1d3b6ef0ef 100644 --- a/src/analyzer/protocol/dce-rpc/DCE_RPC.cc +++ b/src/analyzer/protocol/dce-rpc/DCE_RPC.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include #include diff --git a/src/analyzer/protocol/dns/DNS.cc b/src/analyzer/protocol/dns/DNS.cc index 0c5ef53000..b449589e6c 100644 --- a/src/analyzer/protocol/dns/DNS.cc +++ b/src/analyzer/protocol/dns/DNS.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include #include diff --git a/src/analyzer/protocol/finger/Finger.cc b/src/analyzer/protocol/finger/Finger.cc index bf9bdcc68a..6a5865383b 100644 --- a/src/analyzer/protocol/finger/Finger.cc +++ b/src/analyzer/protocol/finger/Finger.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include diff --git a/src/analyzer/protocol/ftp/FTP.cc b/src/analyzer/protocol/ftp/FTP.cc index 91afe6f8a4..fd38ee8f29 100644 --- a/src/analyzer/protocol/ftp/FTP.cc +++ b/src/analyzer/protocol/ftp/FTP.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include diff --git a/src/analyzer/protocol/gnutella/Gnutella.cc b/src/analyzer/protocol/gnutella/Gnutella.cc index 84a33381a0..60c5475d4a 100644 --- a/src/analyzer/protocol/gnutella/Gnutella.cc +++ b/src/analyzer/protocol/gnutella/Gnutella.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include diff --git a/src/analyzer/protocol/http/HTTP.cc b/src/analyzer/protocol/http/HTTP.cc index ff72c6f350..b477f939ec 100644 --- a/src/analyzer/protocol/http/HTTP.cc +++ b/src/analyzer/protocol/http/HTTP.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include #include diff --git a/src/analyzer/protocol/icmp/ICMP.cc b/src/analyzer/protocol/icmp/ICMP.cc index 84df7ab0d2..6a42e064d7 100644 --- a/src/analyzer/protocol/icmp/ICMP.cc +++ b/src/analyzer/protocol/icmp/ICMP.cc @@ -2,7 +2,7 @@ #include -#include "config.h" +#include "bro-config.h" #include "Net.h" #include "NetVar.h" diff --git a/src/analyzer/protocol/ident/Ident.cc b/src/analyzer/protocol/ident/Ident.cc index 8e25775af8..8d57da3477 100644 --- a/src/analyzer/protocol/ident/Ident.cc +++ b/src/analyzer/protocol/ident/Ident.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include diff --git a/src/analyzer/protocol/interconn/InterConn.cc b/src/analyzer/protocol/interconn/InterConn.cc index eb529cbb6d..c1bf0f37f5 100644 --- a/src/analyzer/protocol/interconn/InterConn.cc +++ b/src/analyzer/protocol/interconn/InterConn.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include "InterConn.h" #include "Event.h" diff --git a/src/analyzer/protocol/login/Login.cc b/src/analyzer/protocol/login/Login.cc index 8dcb7dba55..c39c4cf383 100644 --- a/src/analyzer/protocol/login/Login.cc +++ b/src/analyzer/protocol/login/Login.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include #include diff --git a/src/analyzer/protocol/login/NVT.cc b/src/analyzer/protocol/login/NVT.cc index 462cd42177..11952103bf 100644 --- a/src/analyzer/protocol/login/NVT.cc +++ b/src/analyzer/protocol/login/NVT.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include diff --git a/src/analyzer/protocol/login/RSH.cc b/src/analyzer/protocol/login/RSH.cc index f768f4bdc2..e849b476d0 100644 --- a/src/analyzer/protocol/login/RSH.cc +++ b/src/analyzer/protocol/login/RSH.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include "NetVar.h" #include "Event.h" diff --git a/src/analyzer/protocol/login/Rlogin.cc b/src/analyzer/protocol/login/Rlogin.cc index d90c9be123..6979148676 100644 --- a/src/analyzer/protocol/login/Rlogin.cc +++ b/src/analyzer/protocol/login/Rlogin.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include "NetVar.h" #include "Event.h" diff --git a/src/analyzer/protocol/login/Telnet.cc b/src/analyzer/protocol/login/Telnet.cc index c22b2afc5e..78a3289931 100644 --- a/src/analyzer/protocol/login/Telnet.cc +++ b/src/analyzer/protocol/login/Telnet.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include "Telnet.h" #include "NVT.h" diff --git a/src/analyzer/protocol/mime/MIME.cc b/src/analyzer/protocol/mime/MIME.cc index cbc1abd17d..be10681266 100644 --- a/src/analyzer/protocol/mime/MIME.cc +++ b/src/analyzer/protocol/mime/MIME.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "bro-config.h" #include "NetVar.h" #include "MIME.h" diff --git a/src/analyzer/protocol/ncp/NCP.cc b/src/analyzer/protocol/ncp/NCP.cc index 3858f0b2ad..4605ad2bca 100644 --- a/src/analyzer/protocol/ncp/NCP.cc +++ b/src/analyzer/protocol/ncp/NCP.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include #include diff --git a/src/analyzer/protocol/netbios/NetbiosSSN.cc b/src/analyzer/protocol/netbios/NetbiosSSN.cc index d65a152b2f..a75c23525c 100644 --- a/src/analyzer/protocol/netbios/NetbiosSSN.cc +++ b/src/analyzer/protocol/netbios/NetbiosSSN.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include diff --git a/src/analyzer/protocol/ntp/NTP.cc b/src/analyzer/protocol/ntp/NTP.cc index 5778da9a0e..d46972b8cb 100644 --- a/src/analyzer/protocol/ntp/NTP.cc +++ b/src/analyzer/protocol/ntp/NTP.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include "NetVar.h" #include "NTP.h" diff --git a/src/analyzer/protocol/pop3/POP3.cc b/src/analyzer/protocol/pop3/POP3.cc index 07dce7a7a3..05ff3c317d 100644 --- a/src/analyzer/protocol/pop3/POP3.cc +++ b/src/analyzer/protocol/pop3/POP3.cc @@ -1,7 +1,7 @@ // This code contributed to Bro by Florian Schimandl, Hugh Dollman and // Robin Sommer. -#include "config.h" +#include "bro-config.h" #include #include diff --git a/src/analyzer/protocol/rpc/NFS.cc b/src/analyzer/protocol/rpc/NFS.cc index 136491ec84..8a2620e2e5 100644 --- a/src/analyzer/protocol/rpc/NFS.cc +++ b/src/analyzer/protocol/rpc/NFS.cc @@ -2,7 +2,7 @@ #include -#include "config.h" +#include "bro-config.h" #include "NetVar.h" #include "XDR.h" diff --git a/src/analyzer/protocol/rpc/Portmap.cc b/src/analyzer/protocol/rpc/Portmap.cc index f57d9a915c..5d7c980879 100644 --- a/src/analyzer/protocol/rpc/Portmap.cc +++ b/src/analyzer/protocol/rpc/Portmap.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include "NetVar.h" #include "XDR.h" diff --git a/src/analyzer/protocol/rpc/RPC.cc b/src/analyzer/protocol/rpc/RPC.cc index 38ed229a10..aff6bfefc0 100644 --- a/src/analyzer/protocol/rpc/RPC.cc +++ b/src/analyzer/protocol/rpc/RPC.cc @@ -4,7 +4,7 @@ #include -#include "config.h" +#include "bro-config.h" #include "NetVar.h" #include "XDR.h" diff --git a/src/analyzer/protocol/rpc/XDR.cc b/src/analyzer/protocol/rpc/XDR.cc index 981a982716..9ae1ba1236 100644 --- a/src/analyzer/protocol/rpc/XDR.cc +++ b/src/analyzer/protocol/rpc/XDR.cc @@ -2,7 +2,7 @@ #include -#include "config.h" +#include "bro-config.h" #include "XDR.h" diff --git a/src/analyzer/protocol/smtp/SMTP.cc b/src/analyzer/protocol/smtp/SMTP.cc index 614457dbca..6a19848d86 100644 --- a/src/analyzer/protocol/smtp/SMTP.cc +++ b/src/analyzer/protocol/smtp/SMTP.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include diff --git a/src/analyzer/protocol/stepping-stone/SteppingStone.cc b/src/analyzer/protocol/stepping-stone/SteppingStone.cc index b6473dcf6e..c85b34172f 100644 --- a/src/analyzer/protocol/stepping-stone/SteppingStone.cc +++ b/src/analyzer/protocol/stepping-stone/SteppingStone.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include diff --git a/src/analyzer/protocol/udp/UDP.cc b/src/analyzer/protocol/udp/UDP.cc index 36d5831a6a..3bd3736b2a 100644 --- a/src/analyzer/protocol/udp/UDP.cc +++ b/src/analyzer/protocol/udp/UDP.cc @@ -2,7 +2,7 @@ #include -#include "config.h" +#include "bro-config.h" #include "Net.h" #include "NetVar.h" diff --git a/src/analyzer/protocol/zip/ZIP.h b/src/analyzer/protocol/zip/ZIP.h index b284529d86..580235ec63 100644 --- a/src/analyzer/protocol/zip/ZIP.h +++ b/src/analyzer/protocol/zip/ZIP.h @@ -3,7 +3,7 @@ #ifndef ANALYZER_PROTOCOL_ZIP_ZIP_H #define ANALYZER_PROTOCOL_ZIP_ZIP_H -#include "config.h" +#include "bro-config.h" #include "zlib.h" #include "analyzer/protocol/tcp/TCP.h" diff --git a/src/bif_arg.cc b/src/bif_arg.cc index 92e228032b..f5e25f3746 100644 --- a/src/bif_arg.cc +++ b/src/bif_arg.cc @@ -1,4 +1,4 @@ -#include "config.h" +#include "bro-config.h" #include #include diff --git a/src/bsd-getopt-long.c b/src/bsd-getopt-long.c index 7ecb064fc8..65a3d94093 100644 --- a/src/bsd-getopt-long.c +++ b/src/bsd-getopt-long.c @@ -54,7 +54,7 @@ #define IN_GETOPT_LONG_C 1 -#include +#include #include #include #include diff --git a/src/file_analysis/Component.h b/src/file_analysis/Component.h index 1900369f10..6e282da205 100644 --- a/src/file_analysis/Component.h +++ b/src/file_analysis/Component.h @@ -9,7 +9,7 @@ #include "Val.h" -#include "../config.h" +#include "../bro-config.h" #include "../util.h" namespace file_analysis { diff --git a/src/file_analysis/Tag.h b/src/file_analysis/Tag.h index aa38836403..c28183a07f 100644 --- a/src/file_analysis/Tag.h +++ b/src/file_analysis/Tag.h @@ -3,7 +3,7 @@ #ifndef FILE_ANALYZER_TAG_H #define FILE_ANALYZER_TAG_H -#include "config.h" +#include "bro-config.h" #include "util.h" #include "../Tag.h" #include "plugin/TaggedComponent.h" diff --git a/src/input/Tag.h b/src/input/Tag.h index 8188fbc294..c9e997f8e9 100644 --- a/src/input/Tag.h +++ b/src/input/Tag.h @@ -3,7 +3,7 @@ #ifndef INPUT_TAG_H #define INPUT_TAG_H -#include "config.h" +#include "bro-config.h" #include "util.h" #include "../Tag.h" #include "plugin/TaggedComponent.h" diff --git a/src/input/readers/sqlite/SQLite.cc b/src/input/readers/sqlite/SQLite.cc index 3790e5919d..9352d04742 100644 --- a/src/input/readers/sqlite/SQLite.cc +++ b/src/input/readers/sqlite/SQLite.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include #include diff --git a/src/input/readers/sqlite/SQLite.h b/src/input/readers/sqlite/SQLite.h index 5d82bc55f1..5add678b16 100644 --- a/src/input/readers/sqlite/SQLite.h +++ b/src/input/readers/sqlite/SQLite.h @@ -3,7 +3,7 @@ #ifndef INPUT_READERS_SQLITE_H #define INPUT_READERS_SQLITE_H -#include "config.h" +#include "bro-config.h" #include #include diff --git a/src/iosource/BPF_Program.cc b/src/iosource/BPF_Program.cc index 70469c97e7..451a74bed3 100644 --- a/src/iosource/BPF_Program.cc +++ b/src/iosource/BPF_Program.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include "util.h" #include "BPF_Program.h" diff --git a/src/iosource/PktDumper.cc b/src/iosource/PktDumper.cc index a4bc3a82f8..10c95e8021 100644 --- a/src/iosource/PktDumper.cc +++ b/src/iosource/PktDumper.cc @@ -4,7 +4,7 @@ #include #include -#include "config.h" +#include "bro-config.h" #include "PktDumper.h" diff --git a/src/iosource/PktSrc.cc b/src/iosource/PktSrc.cc index 8012f79f1b..f44aae77c5 100644 --- a/src/iosource/PktSrc.cc +++ b/src/iosource/PktSrc.cc @@ -3,7 +3,7 @@ #include #include -#include "config.h" +#include "bro-config.h" #include "util.h" #include "PktSrc.h" diff --git a/src/iosource/pcap/Source.cc b/src/iosource/pcap/Source.cc index bebe02c018..2af21bf9b4 100644 --- a/src/iosource/pcap/Source.cc +++ b/src/iosource/pcap/Source.cc @@ -2,7 +2,7 @@ #include -#include "config.h" +#include "bro-config.h" #include "Source.h" #include "iosource/Packet.h" diff --git a/src/logging/Tag.h b/src/logging/Tag.h index b5b235154a..ae75487664 100644 --- a/src/logging/Tag.h +++ b/src/logging/Tag.h @@ -3,7 +3,7 @@ #ifndef LOGGING_TAG_H #define LOGGING_TAG_H -#include "config.h" +#include "bro-config.h" #include "util.h" #include "../Tag.h" #include "plugin/TaggedComponent.h" diff --git a/src/logging/writers/sqlite/SQLite.cc b/src/logging/writers/sqlite/SQLite.cc index 090810055d..ce04839337 100644 --- a/src/logging/writers/sqlite/SQLite.cc +++ b/src/logging/writers/sqlite/SQLite.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include #include diff --git a/src/logging/writers/sqlite/SQLite.h b/src/logging/writers/sqlite/SQLite.h index a820530456..cce87da2ef 100644 --- a/src/logging/writers/sqlite/SQLite.h +++ b/src/logging/writers/sqlite/SQLite.h @@ -5,7 +5,7 @@ #ifndef LOGGING_WRITER_SQLITE_H #define LOGGING_WRITER_SQLITE_H -#include "config.h" +#include "bro-config.h" #include "logging/WriterBackend.h" #include "threading/formatters/Ascii.h" diff --git a/src/main.cc b/src/main.cc index 425269b713..64acb408ea 100644 --- a/src/main.cc +++ b/src/main.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include #include diff --git a/src/nb_dns.c b/src/nb_dns.c index 33a00837e4..1e5d427924 100644 --- a/src/nb_dns.c +++ b/src/nb_dns.c @@ -11,7 +11,7 @@ * crack reply buffers is private. */ -#include "config.h" /* must appear before first ifdef */ +#include "bro-config.h" /* must appear before first ifdef */ #include #include diff --git a/src/net_util.cc b/src/net_util.cc index aa88903a8a..95be1f8b0c 100644 --- a/src/net_util.cc +++ b/src/net_util.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include #include diff --git a/src/net_util.h b/src/net_util.h index d68a7110ce..ebdd0cbb88 100644 --- a/src/net_util.h +++ b/src/net_util.h @@ -3,7 +3,7 @@ #ifndef netutil_h #define netutil_h -#include "config.h" +#include "bro-config.h" // Define first. typedef enum { diff --git a/src/plugin/Plugin.h b/src/plugin/Plugin.h index 3562891e84..ce3d53d44e 100644 --- a/src/plugin/Plugin.h +++ b/src/plugin/Plugin.h @@ -7,7 +7,7 @@ #include #include -#include "config.h" +#include "bro-config.h" #include "analyzer/Component.h" #include "file_analysis/Component.h" #include "iosource/Component.h" diff --git a/src/rule-parse.y b/src/rule-parse.y index b0e00d10ed..32ada02cb3 100644 --- a/src/rule-parse.y +++ b/src/rule-parse.y @@ -2,7 +2,7 @@ #include #include #include -#include "config.h" +#include "bro-config.h" #include "RuleMatcher.h" #include "Reporter.h" #include "IPAddr.h" diff --git a/src/setsignal.c b/src/setsignal.c index b49f0784e9..6344820398 100644 --- a/src/setsignal.c +++ b/src/setsignal.c @@ -2,7 +2,7 @@ * See the file "COPYING" in the main distribution directory for copyright. */ -#include "config.h" /* must appear before first ifdef */ +#include "bro-config.h" /* must appear before first ifdef */ #include diff --git a/src/strsep.c b/src/strsep.c index 15a750885d..8540ac3688 100644 --- a/src/strsep.c +++ b/src/strsep.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. */ -#include "config.h" +#include "bro-config.h" #ifndef HAVE_STRSEP diff --git a/src/threading/BasicThread.cc b/src/threading/BasicThread.cc index ffee21bc16..86d7d7b560 100644 --- a/src/threading/BasicThread.cc +++ b/src/threading/BasicThread.cc @@ -2,7 +2,7 @@ #include #include -#include "config.h" +#include "bro-config.h" #include "BasicThread.h" #include "Manager.h" diff --git a/src/threading/Formatter.cc b/src/threading/Formatter.cc index f003f37d29..3f366de90a 100644 --- a/src/threading/Formatter.cc +++ b/src/threading/Formatter.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include #include diff --git a/src/threading/formatters/Ascii.cc b/src/threading/formatters/Ascii.cc index 6c114ff3fd..07ec05ca8b 100644 --- a/src/threading/formatters/Ascii.cc +++ b/src/threading/formatters/Ascii.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include #include diff --git a/src/threading/formatters/JSON.cc b/src/threading/formatters/JSON.cc index e1a5713461..1a2fd84c4a 100644 --- a/src/threading/formatters/JSON.cc +++ b/src/threading/formatters/JSON.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #ifndef __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS diff --git a/src/util.cc b/src/util.cc index a76ba84de3..6a03859a3c 100644 --- a/src/util.cc +++ b/src/util.cc @@ -1,6 +1,6 @@ // See the file "COPYING" in the main distribution directory for copyright. -#include "config.h" +#include "bro-config.h" #include "util-config.h" #ifdef TIME_WITH_SYS_TIME diff --git a/src/util.h b/src/util.h index f65e0fb7d0..901bb44d1c 100644 --- a/src/util.h +++ b/src/util.h @@ -23,7 +23,7 @@ #include #include #include -#include "config.h" +#include "bro-config.h" #if __STDC__ #define myattribute __attribute__