diff --git a/.clang-format b/.clang-format index 4b5f426689..14203ffdc7 100644 --- a/.clang-format +++ b/.clang-format @@ -81,11 +81,14 @@ IncludeBlocks: Regroup # 5: everything else, which should catch any of the auto-generated code from the # build directory as well # -# Sections 0-1 and 2-3 get group together in their respective blocks +# Sections 0-1 and 2-3 get grouped together in their respective blocks IncludeCategories: - Regex: '^"zeek-config\.h"' - Priority: 0 + Priority: 1 SortPriority: 1 + - Regex: '^"zeek/zeek-config\.h"' + Priority: 1 + SortPriority: 2 - Regex: '^<[[:print:]]+\.(h|hh)>' Priority: 2 SortPriority: 2 diff --git a/src/Attr.cc b/src/Attr.cc index d3375c6826..d5a25cfc1e 100644 --- a/src/Attr.cc +++ b/src/Attr.cc @@ -2,13 +2,14 @@ #include "zeek/Attr.h" +#include "zeek/zeek-config.h" + #include "zeek/Desc.h" #include "zeek/Expr.h" #include "zeek/IntrusivePtr.h" #include "zeek/Val.h" #include "zeek/input/Manager.h" #include "zeek/threading/SerialTypes.h" -#include "zeek/zeek-config.h" namespace zeek::detail { diff --git a/src/Base64.cc b/src/Base64.cc index 1fe2a633c1..7e76f42520 100644 --- a/src/Base64.cc +++ b/src/Base64.cc @@ -1,11 +1,12 @@ #include "zeek/Base64.h" +#include "zeek/zeek-config.h" + #include #include "zeek/Conn.h" #include "zeek/Reporter.h" #include "zeek/ZeekString.h" -#include "zeek/zeek-config.h" namespace zeek::detail { diff --git a/src/Base64.h b/src/Base64.h index 8c262646cd..943cb52391 100644 --- a/src/Base64.h +++ b/src/Base64.h @@ -1,9 +1,9 @@ #pragma once -#include - #include "zeek/zeek-config.h" +#include + namespace zeek { diff --git a/src/BifReturnVal.h b/src/BifReturnVal.h index 817df6aa50..70fd901ba2 100644 --- a/src/BifReturnVal.h +++ b/src/BifReturnVal.h @@ -2,9 +2,10 @@ #pragma once -#include "zeek/IntrusivePtr.h" #include "zeek/zeek-config.h" +#include "zeek/IntrusivePtr.h" + namespace zeek { diff --git a/src/CCL.cc b/src/CCL.cc index 68503e241c..02d23d9bac 100644 --- a/src/CCL.cc +++ b/src/CCL.cc @@ -2,11 +2,12 @@ #include "zeek/CCL.h" +#include "zeek/zeek-config.h" + #include #include "zeek/DFA.h" #include "zeek/RE.h" -#include "zeek/zeek-config.h" namespace zeek::detail { diff --git a/src/CompHash.cc b/src/CompHash.cc index 50e8f446f6..72fe39364f 100644 --- a/src/CompHash.cc +++ b/src/CompHash.cc @@ -2,6 +2,8 @@ #include "zeek/CompHash.h" +#include "zeek/zeek-config.h" + #include #include #include @@ -13,7 +15,6 @@ #include "zeek/Reporter.h" #include "zeek/Val.h" #include "zeek/ZeekString.h" -#include "zeek/zeek-config.h" namespace zeek::detail { diff --git a/src/Conn.cc b/src/Conn.cc index e11e149a8e..46d057a268 100644 --- a/src/Conn.cc +++ b/src/Conn.cc @@ -2,6 +2,8 @@ #include "zeek/Conn.h" +#include "zeek/zeek-config.h" + #include #include @@ -19,7 +21,6 @@ #include "zeek/packet_analysis/protocol/ip/SessionAdapter.h" #include "zeek/packet_analysis/protocol/tcp/TCP.h" #include "zeek/session/Manager.h" -#include "zeek/zeek-config.h" namespace zeek { diff --git a/src/DFA.cc b/src/DFA.cc index 99c3a04499..6a2c018813 100644 --- a/src/DFA.cc +++ b/src/DFA.cc @@ -2,10 +2,11 @@ #include "zeek/DFA.h" +#include "zeek/zeek-config.h" + #include "zeek/Desc.h" #include "zeek/EquivClass.h" #include "zeek/Hash.h" -#include "zeek/zeek-config.h" namespace zeek::detail { diff --git a/src/DNS_Mgr.cc b/src/DNS_Mgr.cc index 79365930b9..408fda9f10 100644 --- a/src/DNS_Mgr.cc +++ b/src/DNS_Mgr.cc @@ -2,10 +2,10 @@ #include "zeek/DNS_Mgr.h" +#include "zeek/zeek-config.h" + #include #include - -#include "zeek/zeek-config.h" #ifdef TIME_WITH_SYS_TIME #include #include diff --git a/src/DbgBreakpoint.cc b/src/DbgBreakpoint.cc index d15fa005cf..b309326b23 100644 --- a/src/DbgBreakpoint.cc +++ b/src/DbgBreakpoint.cc @@ -2,6 +2,8 @@ #include "zeek/DbgBreakpoint.h" +#include "zeek/zeek-config.h" + #include #include "zeek/Debug.h" @@ -15,7 +17,6 @@ #include "zeek/Timer.h" #include "zeek/Val.h" #include "zeek/module_util.h" -#include "zeek/zeek-config.h" namespace zeek::detail { diff --git a/src/DbgHelp.cc b/src/DbgHelp.cc index 9d51d4201b..373f0c0613 100644 --- a/src/DbgHelp.cc +++ b/src/DbgHelp.cc @@ -1,4 +1,5 @@ // Bro Debugger Help -#include "zeek/Debug.h" #include "zeek/zeek-config.h" + +#include "zeek/Debug.h" diff --git a/src/DbgWatch.cc b/src/DbgWatch.cc index 985ba098d5..a5a9fc3f0d 100644 --- a/src/DbgWatch.cc +++ b/src/DbgWatch.cc @@ -2,9 +2,10 @@ #include "zeek/DbgWatch.h" +#include "zeek/zeek-config.h" + #include "zeek/Debug.h" #include "zeek/Reporter.h" -#include "zeek/zeek-config.h" namespace zeek::detail { diff --git a/src/Debug.cc b/src/Debug.cc index 60fac5eeb7..d29daf842b 100644 --- a/src/Debug.cc +++ b/src/Debug.cc @@ -2,14 +2,14 @@ #include "zeek/Debug.h" +#include "zeek/zeek-config.h" + #include #include #include #include #include -#include "zeek/zeek-config.h" - #ifdef HAVE_READLINE #include #include diff --git a/src/DebugCmds.cc b/src/DebugCmds.cc index 866a5efbff..3f69bccbd7 100644 --- a/src/DebugCmds.cc +++ b/src/DebugCmds.cc @@ -3,6 +3,8 @@ #include "zeek/DebugCmds.h" +#include "zeek/zeek-config.h" + #include #include #include @@ -21,7 +23,6 @@ #include "zeek/Stmt.h" #include "zeek/Val.h" #include "zeek/util.h" -#include "zeek/zeek-config.h" using namespace std; diff --git a/src/DebugLogger.h b/src/DebugLogger.h index ed8f9a7d37..ce2aae57dc 100644 --- a/src/DebugLogger.h +++ b/src/DebugLogger.h @@ -5,12 +5,12 @@ #ifdef DEBUG +#include "zeek/zeek-config.h" + #include #include #include -#include "zeek/zeek-config.h" - #define DBG_LOG(stream, args...) \ if ( ::zeek::detail::debug_logger.IsEnabled(stream) ) \ ::zeek::detail::debug_logger.Log(stream, args) diff --git a/src/Desc.cc b/src/Desc.cc index a02397cfe5..25b70a1e77 100644 --- a/src/Desc.cc +++ b/src/Desc.cc @@ -2,6 +2,8 @@ #include "zeek/Desc.h" +#include "zeek/zeek-config.h" + #include #include #include @@ -11,7 +13,6 @@ #include "zeek/File.h" #include "zeek/IPAddr.h" #include "zeek/Reporter.h" -#include "zeek/zeek-config.h" #define DEFAULT_SIZE 128 #define SLOP 10 diff --git a/src/Discard.cc b/src/Discard.cc index 5a6dbcbe2f..ba36754451 100644 --- a/src/Discard.cc +++ b/src/Discard.cc @@ -2,6 +2,8 @@ #include "zeek/Discard.h" +#include "zeek/zeek-config.h" + #include #include "zeek/Func.h" @@ -11,7 +13,6 @@ #include "zeek/Val.h" #include "zeek/Var.h" #include "zeek/ZeekString.h" -#include "zeek/zeek-config.h" namespace zeek::detail { diff --git a/src/EquivClass.cc b/src/EquivClass.cc index 81c3e56c39..7fba212541 100644 --- a/src/EquivClass.cc +++ b/src/EquivClass.cc @@ -2,9 +2,10 @@ #include "zeek/EquivClass.h" +#include "zeek/zeek-config.h" + #include "zeek/CCL.h" #include "zeek/util.h" -#include "zeek/zeek-config.h" namespace zeek::detail { diff --git a/src/Event.cc b/src/Event.cc index 86ba5269d1..c6dfc5365a 100644 --- a/src/Event.cc +++ b/src/Event.cc @@ -2,6 +2,8 @@ #include "zeek/Event.h" +#include "zeek/zeek-config.h" + #include "zeek/Desc.h" #include "zeek/Func.h" #include "zeek/NetVar.h" @@ -11,7 +13,6 @@ #include "zeek/iosource/Manager.h" #include "zeek/iosource/PktSrc.h" #include "zeek/plugin/Manager.h" -#include "zeek/zeek-config.h" zeek::EventMgr zeek::event_mgr; zeek::EventMgr& mgr = zeek::event_mgr; diff --git a/src/EventRegistry.h b/src/EventRegistry.h index 6d5c6a5853..5b48334bbc 100644 --- a/src/EventRegistry.h +++ b/src/EventRegistry.h @@ -2,14 +2,14 @@ #pragma once +#include "zeek/zeek-config.h" + #include #include #include #include #include -#include "zeek/zeek-config.h" - namespace zeek { diff --git a/src/Expr.cc b/src/Expr.cc index 840223fc1d..42b6350613 100644 --- a/src/Expr.cc +++ b/src/Expr.cc @@ -2,6 +2,8 @@ #include "zeek/Expr.h" +#include "zeek/zeek-config.h" + #include "zeek/DebugLogger.h" #include "zeek/Desc.h" #include "zeek/Event.h" @@ -20,7 +22,6 @@ #include "zeek/digest.h" #include "zeek/module_util.h" #include "zeek/script_opt/ExprOptInfo.h" -#include "zeek/zeek-config.h" namespace zeek::detail { diff --git a/src/File.cc b/src/File.cc index 67c07399dc..00fa141b3a 100644 --- a/src/File.cc +++ b/src/File.cc @@ -2,9 +2,9 @@ #include "zeek/File.h" -#include - #include "zeek/zeek-config.h" + +#include #ifdef TIME_WITH_SYS_TIME #include #include diff --git a/src/Frag.cc b/src/Frag.cc index 7b3b4d9237..06a940008e 100644 --- a/src/Frag.cc +++ b/src/Frag.cc @@ -2,13 +2,14 @@ #include "zeek/Frag.h" +#include "zeek/zeek-config.h" + #include "zeek/Hash.h" #include "zeek/IP.h" #include "zeek/NetVar.h" #include "zeek/Reporter.h" #include "zeek/RunState.h" #include "zeek/session/Manager.h" -#include "zeek/zeek-config.h" constexpr uint32_t MIN_ACCEPTABLE_FRAG_SIZE = 64; constexpr uint32_t MAX_ACCEPTABLE_FRAG_SIZE = 64000; diff --git a/src/Func.cc b/src/Func.cc index 46ada094af..355544362e 100644 --- a/src/Func.cc +++ b/src/Func.cc @@ -3,10 +3,10 @@ #include "zeek/Func.h" +#include "zeek/zeek-config.h" + #include #include - -#include "zeek/zeek-config.h" #ifdef TIME_WITH_SYS_TIME #include #include diff --git a/src/Hash.cc b/src/Hash.cc index 740a26b167..a81ad750f9 100644 --- a/src/Hash.cc +++ b/src/Hash.cc @@ -2,6 +2,8 @@ #include "zeek/Hash.h" +#include "zeek/zeek-config.h" + #include #include #include @@ -12,7 +14,6 @@ #include "zeek/Val.h" // needed for const.bif #include "zeek/ZeekString.h" #include "zeek/digest.h" -#include "zeek/zeek-config.h" #include "const.bif.netvar_h" diff --git a/src/ID.cc b/src/ID.cc index b5ad900e07..b58cf2e872 100644 --- a/src/ID.cc +++ b/src/ID.cc @@ -3,6 +3,8 @@ #include "zeek/ID.h" +#include "zeek/zeek-config.h" + #include "zeek/Attr.h" #include "zeek/Desc.h" #include "zeek/Dict.h" @@ -16,7 +18,6 @@ #include "zeek/Val.h" #include "zeek/module_util.h" #include "zeek/script_opt/IDOptInfo.h" -#include "zeek/zeek-config.h" #include "zeek/zeekygen/IdentifierInfo.h" #include "zeek/zeekygen/Manager.h" #include "zeek/zeekygen/ScriptInfo.h" diff --git a/src/IP.h b/src/IP.h index 7e8e99f762..8aebb72d92 100644 --- a/src/IP.h +++ b/src/IP.h @@ -2,11 +2,11 @@ #pragma once -#include // for u_char +#include "zeek/zeek-config.h" + #include #include - -#include "zeek/zeek-config.h" +#include // for u_char #ifdef HAVE_NETINET_IP6_H #include diff --git a/src/NFA.cc b/src/NFA.cc index 88f1199e9f..0d3a6d9c79 100644 --- a/src/NFA.cc +++ b/src/NFA.cc @@ -2,12 +2,13 @@ #include "zeek/NFA.h" +#include "zeek/zeek-config.h" + #include #include "zeek/Desc.h" #include "zeek/EquivClass.h" #include "zeek/IntSet.h" -#include "zeek/zeek-config.h" namespace zeek::detail { diff --git a/src/NetVar.cc b/src/NetVar.cc index c12623ffbd..6f3acb2ad1 100644 --- a/src/NetVar.cc +++ b/src/NetVar.cc @@ -2,11 +2,12 @@ #include "zeek/NetVar.h" +#include "zeek/zeek-config.h" + #include "zeek/EventHandler.h" #include "zeek/ID.h" #include "zeek/Val.h" #include "zeek/Var.h" -#include "zeek/zeek-config.h" zeek::RecordType* conn_id; zeek::RecordType* endpoint; diff --git a/src/Obj.cc b/src/Obj.cc index 413f0472ad..3a36e39e49 100644 --- a/src/Obj.cc +++ b/src/Obj.cc @@ -2,13 +2,14 @@ #include "zeek/Obj.h" +#include "zeek/zeek-config.h" + #include #include "zeek/Desc.h" #include "zeek/File.h" #include "zeek/Func.h" #include "zeek/plugin/Manager.h" -#include "zeek/zeek-config.h" namespace zeek { diff --git a/src/Obj.h b/src/Obj.h index 041db27df3..26a79fbb70 100644 --- a/src/Obj.h +++ b/src/Obj.h @@ -2,10 +2,10 @@ #pragma once -#include - #include "zeek/zeek-config.h" +#include + namespace zeek { diff --git a/src/Options.cc b/src/Options.cc index cfd315a237..9bc235cbcc 100644 --- a/src/Options.cc +++ b/src/Options.cc @@ -2,10 +2,11 @@ #include "zeek/Options.h" +#include "zeek/zeek-config.h" + #include #include "zeek/script_opt/ScriptOpt.h" -#include "zeek/zeek-config.h" #ifdef HAVE_GETOPT_H #include diff --git a/src/PolicyFile.cc b/src/PolicyFile.cc index f7f268d9b6..5176cf1539 100644 --- a/src/PolicyFile.cc +++ b/src/PolicyFile.cc @@ -1,5 +1,7 @@ #include "zeek/PolicyFile.h" +#include "zeek/zeek-config.h" + #include #include #include @@ -12,7 +14,6 @@ #include "zeek/Debug.h" #include "zeek/Reporter.h" #include "zeek/util.h" -#include "zeek/zeek-config.h" using namespace std; diff --git a/src/PriorityQueue.cc b/src/PriorityQueue.cc index e95f6dd711..4a0397b004 100644 --- a/src/PriorityQueue.cc +++ b/src/PriorityQueue.cc @@ -2,12 +2,13 @@ #include "zeek/PriorityQueue.h" +#include "zeek/zeek-config.h" + #include #include #include "zeek/Reporter.h" #include "zeek/util.h" -#include "zeek/zeek-config.h" namespace zeek::detail { diff --git a/src/PriorityQueue.h b/src/PriorityQueue.h index 08c5ce8cf1..d0e27219fa 100644 --- a/src/PriorityQueue.h +++ b/src/PriorityQueue.h @@ -2,11 +2,11 @@ #pragma once +#include "zeek/zeek-config.h" + #include #include -#include "zeek/zeek-config.h" - namespace zeek::detail { diff --git a/src/RE.cc b/src/RE.cc index 8f59592949..7e6443d40c 100644 --- a/src/RE.cc +++ b/src/RE.cc @@ -2,6 +2,8 @@ #include "zeek/RE.h" +#include "zeek/zeek-config.h" + #include #include @@ -10,7 +12,6 @@ #include "zeek/EquivClass.h" #include "zeek/Reporter.h" #include "zeek/ZeekString.h" -#include "zeek/zeek-config.h" zeek::detail::CCL* zeek::detail::curr_ccl = nullptr; zeek::detail::Specific_RE_Matcher* zeek::detail::rem = nullptr; diff --git a/src/RandTest.h b/src/RandTest.h index e3be5e997e..fa44827c89 100644 --- a/src/RandTest.h +++ b/src/RandTest.h @@ -1,9 +1,9 @@ #pragma once -#include - #include "zeek/zeek-config.h" +#include + #define RT_MONTEN \ 6 /* Bytes used as Monte Carlo \ co-ordinates. This should be no more \ diff --git a/src/Reassem.cc b/src/Reassem.cc index e7eba0e82d..5ab359211e 100644 --- a/src/Reassem.cc +++ b/src/Reassem.cc @@ -2,10 +2,11 @@ #include "zeek/Reassem.h" +#include "zeek/zeek-config.h" + #include #include "zeek/Desc.h" -#include "zeek/zeek-config.h" using std::min; diff --git a/src/Reporter.cc b/src/Reporter.cc index e9b3fb67f4..33ff1be1ba 100644 --- a/src/Reporter.cc +++ b/src/Reporter.cc @@ -4,6 +4,8 @@ #include "zeek/Reporter.h" +#include "zeek/zeek-config.h" + #include #include @@ -20,7 +22,6 @@ #include "zeek/input.h" #include "zeek/plugin/Manager.h" #include "zeek/plugin/Plugin.h" -#include "zeek/zeek-config.h" #ifdef SYSLOG_INT extern "C" diff --git a/src/Rule.cc b/src/Rule.cc index 6653fc5b7a..82a8301883 100644 --- a/src/Rule.cc +++ b/src/Rule.cc @@ -1,9 +1,10 @@ #include "zeek/Rule.h" +#include "zeek/zeek-config.h" + #include "zeek/RuleAction.h" #include "zeek/RuleCondition.h" #include "zeek/RuleMatcher.h" -#include "zeek/zeek-config.h" namespace zeek::detail { diff --git a/src/RuleAction.cc b/src/RuleAction.cc index 319d59703d..32feb824e8 100644 --- a/src/RuleAction.cc +++ b/src/RuleAction.cc @@ -1,5 +1,7 @@ #include "zeek/RuleAction.h" +#include "zeek/zeek-config.h" + #include #include "zeek/Conn.h" @@ -8,7 +10,6 @@ #include "zeek/RuleMatcher.h" #include "zeek/analyzer/Manager.h" #include "zeek/analyzer/protocol/pia/PIA.h" -#include "zeek/zeek-config.h" using std::string; diff --git a/src/RuleCondition.cc b/src/RuleCondition.cc index 5058c6bfda..39d21e9a4b 100644 --- a/src/RuleCondition.cc +++ b/src/RuleCondition.cc @@ -1,5 +1,7 @@ #include "zeek/RuleCondition.h" +#include "zeek/zeek-config.h" + #include "zeek/Func.h" #include "zeek/ID.h" #include "zeek/Reporter.h" @@ -7,7 +9,6 @@ #include "zeek/Scope.h" #include "zeek/Val.h" #include "zeek/analyzer/protocol/tcp/TCP.h" -#include "zeek/zeek-config.h" static inline bool is_established(const zeek::analyzer::tcp::TCP_Endpoint* e) { diff --git a/src/RuleMatcher.cc b/src/RuleMatcher.cc index 2745b487b9..d8d709cdf0 100644 --- a/src/RuleMatcher.cc +++ b/src/RuleMatcher.cc @@ -1,6 +1,8 @@ #include "zeek/RuleMatcher.h" +#include "zeek/zeek-config.h" + #include #include @@ -22,7 +24,6 @@ #include "zeek/ZeekString.h" #include "zeek/analyzer/Analyzer.h" #include "zeek/module_util.h" -#include "zeek/zeek-config.h" using namespace std; diff --git a/src/RunState.cc b/src/RunState.cc index b5cfc49a0a..96bb7a5b2a 100644 --- a/src/RunState.cc +++ b/src/RunState.cc @@ -2,9 +2,9 @@ #include "zeek/RunState.h" -#include - #include "zeek/zeek-config.h" + +#include #ifdef TIME_WITH_SYS_TIME #include #include diff --git a/src/RunState.h b/src/RunState.h index 53ce03f988..6bba345b74 100644 --- a/src/RunState.h +++ b/src/RunState.h @@ -2,11 +2,11 @@ #pragma once +#include "zeek/zeek-config.h" + #include #include -#include "zeek/zeek-config.h" - namespace zeek { diff --git a/src/Scope.cc b/src/Scope.cc index 99dde7fc84..ce8438bb44 100644 --- a/src/Scope.cc +++ b/src/Scope.cc @@ -2,13 +2,14 @@ #include "zeek/Scope.h" +#include "zeek/zeek-config.h" + #include "zeek/Desc.h" #include "zeek/ID.h" #include "zeek/IntrusivePtr.h" #include "zeek/Reporter.h" #include "zeek/Val.h" #include "zeek/module_util.h" -#include "zeek/zeek-config.h" namespace zeek::detail { diff --git a/src/SerializationFormat.h b/src/SerializationFormat.h index f24f2bcf5b..e0eb139285 100644 --- a/src/SerializationFormat.h +++ b/src/SerializationFormat.h @@ -2,11 +2,11 @@ #pragma once +#include "zeek/zeek-config.h" + #include #include -#include "zeek/zeek-config.h" - struct in_addr; struct in6_addr; diff --git a/src/SmithWaterman.cc b/src/SmithWaterman.cc index 1f4ad09fa6..c02fe2bc37 100644 --- a/src/SmithWaterman.cc +++ b/src/SmithWaterman.cc @@ -2,6 +2,8 @@ #include "zeek/SmithWaterman.h" +#include "zeek/zeek-config.h" + #include #include @@ -9,7 +11,6 @@ #include "zeek/Val.h" #include "zeek/Var.h" #include "zeek/util.h" -#include "zeek/zeek-config.h" namespace zeek::detail { diff --git a/src/Stats.h b/src/Stats.h index deae924ae8..ab3a2f6fa8 100644 --- a/src/Stats.h +++ b/src/Stats.h @@ -2,13 +2,13 @@ #pragma once +#include "zeek/zeek-config.h" + #include #include #include #include -#include "zeek/zeek-config.h" - namespace zeek { diff --git a/src/Stmt.cc b/src/Stmt.cc index 5ead79efe5..e2a01395b8 100644 --- a/src/Stmt.cc +++ b/src/Stmt.cc @@ -2,6 +2,8 @@ #include "zeek/Stmt.h" +#include "zeek/zeek-config.h" + #include "zeek/CompHash.h" #include "zeek/Debug.h" #include "zeek/Desc.h" @@ -19,7 +21,6 @@ #include "zeek/logging/Manager.h" #include "zeek/logging/logging.bif.h" #include "zeek/script_opt/StmtOptInfo.h" -#include "zeek/zeek-config.h" namespace zeek::detail { diff --git a/src/Tag.h b/src/Tag.h index da88e999a1..086adee438 100644 --- a/src/Tag.h +++ b/src/Tag.h @@ -2,12 +2,13 @@ #pragma once +#include "zeek/zeek-config.h" + #include #include #include "zeek/IntrusivePtr.h" #include "zeek/util.h" -#include "zeek/zeek-config.h" namespace zeek { diff --git a/src/Timer.cc b/src/Timer.cc index 3582bfecea..0bc71e072c 100644 --- a/src/Timer.cc +++ b/src/Timer.cc @@ -2,6 +2,8 @@ #include "zeek/Timer.h" +#include "zeek/zeek-config.h" + #include "zeek/Desc.h" #include "zeek/NetVar.h" #include "zeek/RunState.h" @@ -9,7 +11,6 @@ #include "zeek/iosource/Manager.h" #include "zeek/iosource/PktSrc.h" #include "zeek/util.h" -#include "zeek/zeek-config.h" namespace zeek::detail { diff --git a/src/TunnelEncapsulation.h b/src/TunnelEncapsulation.h index 4775b9421d..960886a1a3 100644 --- a/src/TunnelEncapsulation.h +++ b/src/TunnelEncapsulation.h @@ -2,13 +2,14 @@ #pragma once +#include "zeek/zeek-config.h" + #include #include "zeek/ID.h" #include "zeek/IPAddr.h" #include "zeek/NetVar.h" #include "zeek/UID.h" -#include "zeek/zeek-config.h" namespace zeek { diff --git a/src/Type.cc b/src/Type.cc index 1de76d9880..0d3a6e10cc 100644 --- a/src/Type.cc +++ b/src/Type.cc @@ -2,6 +2,8 @@ #include "zeek/Type.h" +#include "zeek/zeek-config.h" + #include #include #include @@ -14,7 +16,6 @@ #include "zeek/Val.h" #include "zeek/Var.h" #include "zeek/module_util.h" -#include "zeek/zeek-config.h" #include "zeek/zeekygen/IdentifierInfo.h" #include "zeek/zeekygen/Manager.h" #include "zeek/zeekygen/ScriptInfo.h" diff --git a/src/Val.cc b/src/Val.cc index 9e9ad5fdbc..294ffebd5a 100644 --- a/src/Val.cc +++ b/src/Val.cc @@ -2,6 +2,8 @@ #include "zeek/Val.h" +#include "zeek/zeek-config.h" + #include #include #include @@ -35,7 +37,6 @@ #include "zeek/broker/Manager.h" #include "zeek/broker/Store.h" #include "zeek/threading/formatters/JSON.h" -#include "zeek/zeek-config.h" using namespace std; diff --git a/src/Var.cc b/src/Var.cc index 85f53cc3d6..e0d7f7c4c5 100644 --- a/src/Var.cc +++ b/src/Var.cc @@ -2,6 +2,8 @@ #include "zeek/Var.h" +#include "zeek/zeek-config.h" + #include #include "zeek/EventRegistry.h" @@ -16,7 +18,6 @@ #include "zeek/Val.h" #include "zeek/module_util.h" #include "zeek/script_opt/ScriptOpt.h" -#include "zeek/zeek-config.h" namespace zeek::detail { diff --git a/src/ZeekString.cc b/src/ZeekString.cc index a939cde264..b62c661b1b 100644 --- a/src/ZeekString.cc +++ b/src/ZeekString.cc @@ -2,6 +2,8 @@ #include "zeek/ZeekString.h" +#include "zeek/zeek-config.h" + #include #include #include @@ -12,7 +14,6 @@ #include "zeek/Reporter.h" #include "zeek/Val.h" #include "zeek/util.h" -#include "zeek/zeek-config.h" #ifdef DEBUG #define DEBUG_STR(msg) DBG_LOG(zeek::DBG_STRING, msg) diff --git a/src/ZeekString.h b/src/ZeekString.h index c8a4f655a2..8db2c26542 100644 --- a/src/ZeekString.h +++ b/src/ZeekString.h @@ -2,13 +2,13 @@ #pragma once +#include "zeek/zeek-config.h" + #include #include #include #include -#include "zeek/zeek-config.h" - namespace zeek { diff --git a/src/analyzer/Component.h b/src/analyzer/Component.h index 0d130e3eee..ebb2fb01c0 100644 --- a/src/analyzer/Component.h +++ b/src/analyzer/Component.h @@ -2,11 +2,12 @@ #pragma once +#include "zeek/zeek-config.h" + #include "zeek/analyzer/Tag.h" #include "zeek/plugin/Component.h" #include "zeek/plugin/TaggedComponent.h" #include "zeek/util.h" -#include "zeek/zeek-config.h" namespace zeek { diff --git a/src/analyzer/Tag.h b/src/analyzer/Tag.h index 7b4f032f89..f5f291d66e 100644 --- a/src/analyzer/Tag.h +++ b/src/analyzer/Tag.h @@ -3,9 +3,10 @@ #pragma once -#include "zeek/Tag.h" #include "zeek/zeek-config.h" +#include "zeek/Tag.h" + namespace zeek { diff --git a/src/analyzer/protocol/dce-rpc/DCE_RPC.cc b/src/analyzer/protocol/dce-rpc/DCE_RPC.cc index 986ed61c06..b998c5a34e 100644 --- a/src/analyzer/protocol/dce-rpc/DCE_RPC.cc +++ b/src/analyzer/protocol/dce-rpc/DCE_RPC.cc @@ -2,12 +2,12 @@ #include "zeek/analyzer/protocol/dce-rpc/DCE_RPC.h" +#include "zeek/zeek-config.h" + #include #include #include -#include "zeek/zeek-config.h" - using namespace std; namespace zeek::analyzer::dce_rpc diff --git a/src/analyzer/protocol/dns/DNS.cc b/src/analyzer/protocol/dns/DNS.cc index e297fd767a..952e470b07 100644 --- a/src/analyzer/protocol/dns/DNS.cc +++ b/src/analyzer/protocol/dns/DNS.cc @@ -2,6 +2,8 @@ #include "zeek/analyzer/protocol/dns/DNS.h" +#include "zeek/zeek-config.h" + #include #include #include @@ -14,7 +16,6 @@ #include "zeek/ZeekString.h" #include "zeek/analyzer/protocol/dns/events.bif.h" #include "zeek/session/Manager.h" -#include "zeek/zeek-config.h" namespace zeek::analyzer::dns { diff --git a/src/analyzer/protocol/finger/Finger.cc b/src/analyzer/protocol/finger/Finger.cc index 97835237b1..155a1bc14b 100644 --- a/src/analyzer/protocol/finger/Finger.cc +++ b/src/analyzer/protocol/finger/Finger.cc @@ -2,13 +2,14 @@ #include "zeek/analyzer/protocol/finger/Finger.h" +#include "zeek/zeek-config.h" + #include #include "zeek/Event.h" #include "zeek/NetVar.h" #include "zeek/analyzer/protocol/finger/events.bif.h" #include "zeek/analyzer/protocol/tcp/ContentLine.h" -#include "zeek/zeek-config.h" namespace zeek::analyzer::finger { diff --git a/src/analyzer/protocol/ftp/FTP.cc b/src/analyzer/protocol/ftp/FTP.cc index 8cd3e28e2f..6067438431 100644 --- a/src/analyzer/protocol/ftp/FTP.cc +++ b/src/analyzer/protocol/ftp/FTP.cc @@ -2,6 +2,8 @@ #include "zeek/analyzer/protocol/ftp/FTP.h" +#include "zeek/zeek-config.h" + #include #include "zeek/Base64.h" @@ -12,7 +14,6 @@ #include "zeek/analyzer/Manager.h" #include "zeek/analyzer/protocol/ftp/events.bif.h" #include "zeek/analyzer/protocol/login/NVT.h" -#include "zeek/zeek-config.h" namespace zeek::analyzer::ftp { diff --git a/src/analyzer/protocol/gnutella/Gnutella.cc b/src/analyzer/protocol/gnutella/Gnutella.cc index 79eeb9f2c1..4fc37de9f6 100644 --- a/src/analyzer/protocol/gnutella/Gnutella.cc +++ b/src/analyzer/protocol/gnutella/Gnutella.cc @@ -2,6 +2,8 @@ #include "zeek/analyzer/protocol/gnutella/Gnutella.h" +#include "zeek/zeek-config.h" + #include #include @@ -10,7 +12,6 @@ #include "zeek/analyzer/Manager.h" #include "zeek/analyzer/protocol/gnutella/events.bif.h" #include "zeek/analyzer/protocol/pia/PIA.h" -#include "zeek/zeek-config.h" namespace zeek::analyzer::gnutella { diff --git a/src/analyzer/protocol/http/HTTP.cc b/src/analyzer/protocol/http/HTTP.cc index 4e434fae88..02ab9b05c6 100644 --- a/src/analyzer/protocol/http/HTTP.cc +++ b/src/analyzer/protocol/http/HTTP.cc @@ -2,6 +2,8 @@ #include "zeek/analyzer/protocol/http/HTTP.h" +#include "zeek/zeek-config.h" + #include #include #include @@ -13,7 +15,6 @@ #include "zeek/analyzer/protocol/http/events.bif.h" #include "zeek/analyzer/protocol/mime/MIME.h" #include "zeek/file_analysis/Manager.h" -#include "zeek/zeek-config.h" namespace zeek::analyzer::http { diff --git a/src/analyzer/protocol/ident/Ident.cc b/src/analyzer/protocol/ident/Ident.cc index 3fe466b47f..47946d5f8a 100644 --- a/src/analyzer/protocol/ident/Ident.cc +++ b/src/analyzer/protocol/ident/Ident.cc @@ -2,13 +2,14 @@ #include "zeek/analyzer/protocol/ident/Ident.h" +#include "zeek/zeek-config.h" + #include #include "zeek/Event.h" #include "zeek/NetVar.h" #include "zeek/ZeekString.h" #include "zeek/analyzer/protocol/ident/events.bif.h" -#include "zeek/zeek-config.h" namespace zeek::analyzer::ident { diff --git a/src/analyzer/protocol/krb/KRB.h b/src/analyzer/protocol/krb/KRB.h index bb840abaa1..9dad969595 100644 --- a/src/analyzer/protocol/krb/KRB.h +++ b/src/analyzer/protocol/krb/KRB.h @@ -2,10 +2,10 @@ #pragma once -#include - #include "zeek/zeek-config.h" +#include + #ifdef USE_KRB5 #include #endif diff --git a/src/analyzer/protocol/login/Login.cc b/src/analyzer/protocol/login/Login.cc index 509a62be36..8be877acc4 100644 --- a/src/analyzer/protocol/login/Login.cc +++ b/src/analyzer/protocol/login/Login.cc @@ -2,6 +2,8 @@ #include "zeek/analyzer/protocol/login/Login.h" +#include "zeek/zeek-config.h" + #include #include @@ -12,7 +14,6 @@ #include "zeek/Var.h" #include "zeek/ZeekString.h" #include "zeek/analyzer/protocol/login/events.bif.h" -#include "zeek/zeek-config.h" namespace zeek::analyzer::login { diff --git a/src/analyzer/protocol/login/NVT.cc b/src/analyzer/protocol/login/NVT.cc index 06fd52f23f..fc675e2b40 100644 --- a/src/analyzer/protocol/login/NVT.cc +++ b/src/analyzer/protocol/login/NVT.cc @@ -2,6 +2,8 @@ #include "zeek/analyzer/protocol/login/NVT.h" +#include "zeek/zeek-config.h" + #include #include "zeek/Event.h" @@ -10,7 +12,6 @@ #include "zeek/ZeekString.h" #include "zeek/analyzer/protocol/login/events.bif.h" #include "zeek/analyzer/protocol/tcp/TCP.h" -#include "zeek/zeek-config.h" #define IS_3_BYTE_OPTION(c) (c >= 251 && c <= 254) diff --git a/src/analyzer/protocol/login/RSH.cc b/src/analyzer/protocol/login/RSH.cc index 677c0e05bc..35cb65b27d 100644 --- a/src/analyzer/protocol/login/RSH.cc +++ b/src/analyzer/protocol/login/RSH.cc @@ -2,11 +2,12 @@ #include "zeek/analyzer/protocol/login/RSH.h" +#include "zeek/zeek-config.h" + #include "zeek/Event.h" #include "zeek/NetVar.h" #include "zeek/Reporter.h" #include "zeek/analyzer/protocol/login/events.bif.h" -#include "zeek/zeek-config.h" namespace zeek::analyzer::login { diff --git a/src/analyzer/protocol/login/Rlogin.cc b/src/analyzer/protocol/login/Rlogin.cc index ee2a9d5c71..7543a437f6 100644 --- a/src/analyzer/protocol/login/Rlogin.cc +++ b/src/analyzer/protocol/login/Rlogin.cc @@ -2,11 +2,12 @@ #include "zeek/analyzer/protocol/login/Rlogin.h" +#include "zeek/zeek-config.h" + #include "zeek/Event.h" #include "zeek/NetVar.h" #include "zeek/Reporter.h" #include "zeek/analyzer/protocol/login/events.bif.h" -#include "zeek/zeek-config.h" namespace zeek::analyzer::login { diff --git a/src/analyzer/protocol/login/Telnet.cc b/src/analyzer/protocol/login/Telnet.cc index 4d3c8275f0..8c0d23a8d8 100644 --- a/src/analyzer/protocol/login/Telnet.cc +++ b/src/analyzer/protocol/login/Telnet.cc @@ -2,9 +2,10 @@ #include "zeek/analyzer/protocol/login/Telnet.h" +#include "zeek/zeek-config.h" + #include "zeek/analyzer/protocol/login/NVT.h" #include "zeek/analyzer/protocol/login/events.bif.h" -#include "zeek/zeek-config.h" namespace zeek::analyzer::login { diff --git a/src/analyzer/protocol/mime/MIME.cc b/src/analyzer/protocol/mime/MIME.cc index 2cc4509241..5762803a49 100644 --- a/src/analyzer/protocol/mime/MIME.cc +++ b/src/analyzer/protocol/mime/MIME.cc @@ -1,12 +1,13 @@ #include "zeek/analyzer/protocol/mime/MIME.h" +#include "zeek/zeek-config.h" + #include "zeek/Base64.h" #include "zeek/NetVar.h" #include "zeek/Reporter.h" #include "zeek/analyzer/protocol/mime/events.bif.h" #include "zeek/digest.h" #include "zeek/file_analysis/Manager.h" -#include "zeek/zeek-config.h" // Here are a few things to do: // diff --git a/src/analyzer/protocol/ncp/NCP.cc b/src/analyzer/protocol/ncp/NCP.cc index 621ac30af5..89b961883d 100644 --- a/src/analyzer/protocol/ncp/NCP.cc +++ b/src/analyzer/protocol/ncp/NCP.cc @@ -2,13 +2,14 @@ #include "zeek/analyzer/protocol/ncp/NCP.h" +#include "zeek/zeek-config.h" + #include #include #include #include "zeek/analyzer/protocol/ncp/consts.bif.h" #include "zeek/analyzer/protocol/ncp/events.bif.h" -#include "zeek/zeek-config.h" using namespace std; diff --git a/src/analyzer/protocol/netbios/NetbiosSSN.cc b/src/analyzer/protocol/netbios/NetbiosSSN.cc index 8c5c9b2d07..18efafa742 100644 --- a/src/analyzer/protocol/netbios/NetbiosSSN.cc +++ b/src/analyzer/protocol/netbios/NetbiosSSN.cc @@ -2,6 +2,8 @@ #include "zeek/analyzer/protocol/netbios/NetbiosSSN.h" +#include "zeek/zeek-config.h" + #include #include "zeek/Event.h" @@ -10,7 +12,6 @@ #include "zeek/ZeekString.h" #include "zeek/analyzer/protocol/netbios/events.bif.h" #include "zeek/session/Manager.h" -#include "zeek/zeek-config.h" constexpr double netbios_ssn_session_timeout = 15.0; diff --git a/src/analyzer/protocol/pop3/POP3.cc b/src/analyzer/protocol/pop3/POP3.cc index c562e22c92..9cffe3b2e1 100644 --- a/src/analyzer/protocol/pop3/POP3.cc +++ b/src/analyzer/protocol/pop3/POP3.cc @@ -3,6 +3,8 @@ #include "zeek/analyzer/protocol/pop3/POP3.h" +#include "zeek/zeek-config.h" + #include #include #include @@ -11,7 +13,6 @@ #include "zeek/Reporter.h" #include "zeek/analyzer/Manager.h" #include "zeek/analyzer/protocol/pop3/events.bif.h" -#include "zeek/zeek-config.h" namespace zeek::analyzer::pop3 { diff --git a/src/analyzer/protocol/rpc/MOUNT.cc b/src/analyzer/protocol/rpc/MOUNT.cc index de6d307220..ed05293ad5 100644 --- a/src/analyzer/protocol/rpc/MOUNT.cc +++ b/src/analyzer/protocol/rpc/MOUNT.cc @@ -2,6 +2,8 @@ #include "zeek/analyzer/protocol/rpc/MOUNT.h" +#include "zeek/zeek-config.h" + #include #include @@ -10,7 +12,6 @@ #include "zeek/ZeekString.h" #include "zeek/analyzer/protocol/rpc/XDR.h" #include "zeek/analyzer/protocol/rpc/events.bif.h" -#include "zeek/zeek-config.h" namespace zeek::analyzer::rpc { diff --git a/src/analyzer/protocol/rpc/NFS.cc b/src/analyzer/protocol/rpc/NFS.cc index d915a5b7b6..89ea8834d2 100644 --- a/src/analyzer/protocol/rpc/NFS.cc +++ b/src/analyzer/protocol/rpc/NFS.cc @@ -2,6 +2,8 @@ #include "zeek/analyzer/protocol/rpc/NFS.h" +#include "zeek/zeek-config.h" + #include #include @@ -10,7 +12,6 @@ #include "zeek/ZeekString.h" #include "zeek/analyzer/protocol/rpc/XDR.h" #include "zeek/analyzer/protocol/rpc/events.bif.h" -#include "zeek/zeek-config.h" namespace zeek::analyzer::rpc { diff --git a/src/analyzer/protocol/rpc/Portmap.cc b/src/analyzer/protocol/rpc/Portmap.cc index 82f6df675a..eee978812d 100644 --- a/src/analyzer/protocol/rpc/Portmap.cc +++ b/src/analyzer/protocol/rpc/Portmap.cc @@ -2,11 +2,12 @@ #include "zeek/analyzer/protocol/rpc/Portmap.h" +#include "zeek/zeek-config.h" + #include "zeek/Event.h" #include "zeek/NetVar.h" #include "zeek/analyzer/protocol/rpc/XDR.h" #include "zeek/analyzer/protocol/rpc/events.bif.h" -#include "zeek/zeek-config.h" #define PMAPPROC_NULL 0 #define PMAPPROC_SET 1 diff --git a/src/analyzer/protocol/rpc/RPC.cc b/src/analyzer/protocol/rpc/RPC.cc index 9a8fe56aa9..735fc95a19 100644 --- a/src/analyzer/protocol/rpc/RPC.cc +++ b/src/analyzer/protocol/rpc/RPC.cc @@ -2,6 +2,8 @@ #include "zeek/analyzer/protocol/rpc/RPC.h" +#include "zeek/zeek-config.h" + #include #include @@ -11,7 +13,6 @@ #include "zeek/analyzer/protocol/rpc/XDR.h" #include "zeek/analyzer/protocol/rpc/events.bif.h" #include "zeek/session/Manager.h" -#include "zeek/zeek-config.h" namespace { // local namespace diff --git a/src/analyzer/protocol/rpc/XDR.cc b/src/analyzer/protocol/rpc/XDR.cc index e902305464..dddae9b154 100644 --- a/src/analyzer/protocol/rpc/XDR.cc +++ b/src/analyzer/protocol/rpc/XDR.cc @@ -2,11 +2,12 @@ #include "zeek/analyzer/protocol/rpc/XDR.h" +#include "zeek/zeek-config.h" + #include #include #include "zeek/analyzer/protocol/rpc/events.bif.h" -#include "zeek/zeek-config.h" uint32_t zeek::analyzer::rpc::extract_XDR_uint32(const u_char*& buf, int& len) { diff --git a/src/analyzer/protocol/smtp/SMTP.cc b/src/analyzer/protocol/smtp/SMTP.cc index c83397662a..2d1d9a7fe6 100644 --- a/src/analyzer/protocol/smtp/SMTP.cc +++ b/src/analyzer/protocol/smtp/SMTP.cc @@ -2,6 +2,8 @@ #include "zeek/analyzer/protocol/smtp/SMTP.h" +#include "zeek/zeek-config.h" + #include #include "zeek/Event.h" @@ -9,7 +11,6 @@ #include "zeek/Reporter.h" #include "zeek/analyzer/Manager.h" #include "zeek/analyzer/protocol/smtp/events.bif.h" -#include "zeek/zeek-config.h" #undef SMTP_CMD_DEF #define SMTP_CMD_DEF(cmd) #cmd, diff --git a/src/analyzer/protocol/zip/ZIP.h b/src/analyzer/protocol/zip/ZIP.h index 5ec76f502f..6b4477fc2b 100644 --- a/src/analyzer/protocol/zip/ZIP.h +++ b/src/analyzer/protocol/zip/ZIP.h @@ -2,10 +2,11 @@ #pragma once +#include "zeek/zeek-config.h" + #include #include "zeek/analyzer/protocol/tcp/TCP.h" -#include "zeek/zeek-config.h" namespace zeek::analyzer::zip { diff --git a/src/broker/Manager.cc b/src/broker/Manager.cc index d8119a4be8..bf11f840ff 100644 --- a/src/broker/Manager.cc +++ b/src/broker/Manager.cc @@ -1176,7 +1176,7 @@ void Manager::ProcessStoreEventInsertUpdate(const TableValPtr& table, const std: { reporter->Error( "ProcessStoreEvent %s: could not convert key \"%s\" for store \"%s\" while receiving " - "remote data. This probably means the tables have different types on different nodes.", + "remote data. This probably means the tables have different types on different nodes.", type, to_string(key).c_str(), store_id.c_str()); return; } diff --git a/src/file_analysis/Component.h b/src/file_analysis/Component.h index 986707c7d9..b6f75bc247 100644 --- a/src/file_analysis/Component.h +++ b/src/file_analysis/Component.h @@ -2,10 +2,11 @@ #pragma once +#include "zeek/zeek-config.h" + #include "zeek/file_analysis/Tag.h" #include "zeek/plugin/Component.h" #include "zeek/plugin/TaggedComponent.h" -#include "zeek/zeek-config.h" namespace zeek { diff --git a/src/file_analysis/Tag.h b/src/file_analysis/Tag.h index cf3b4ac5ce..59ce6f54b5 100644 --- a/src/file_analysis/Tag.h +++ b/src/file_analysis/Tag.h @@ -2,9 +2,10 @@ #pragma once -#include "zeek/Tag.h" #include "zeek/zeek-config.h" +#include "zeek/Tag.h" + namespace zeek::plugin { template class TaggedComponent; diff --git a/src/input/Tag.h b/src/input/Tag.h index a58a583a6b..f62a38bc65 100644 --- a/src/input/Tag.h +++ b/src/input/Tag.h @@ -2,9 +2,10 @@ #pragma once -#include "zeek/Tag.h" #include "zeek/zeek-config.h" +#include "zeek/Tag.h" + namespace zeek { diff --git a/src/input/readers/sqlite/SQLite.cc b/src/input/readers/sqlite/SQLite.cc index 20a2baf3a7..ebc1c52b5a 100644 --- a/src/input/readers/sqlite/SQLite.cc +++ b/src/input/readers/sqlite/SQLite.cc @@ -2,6 +2,8 @@ #include "zeek/input/readers/sqlite/SQLite.h" +#include "zeek/zeek-config.h" + #include #include #include @@ -12,7 +14,6 @@ #include "zeek/logging/writers/ascii/ascii.bif.h" #include "zeek/logging/writers/sqlite/sqlite.bif.h" #include "zeek/threading/SerialTypes.h" -#include "zeek/zeek-config.h" using zeek::threading::Field; using zeek::threading::Value; diff --git a/src/input/readers/sqlite/SQLite.h b/src/input/readers/sqlite/SQLite.h index f768db35a3..797d09ac41 100644 --- a/src/input/readers/sqlite/SQLite.h +++ b/src/input/readers/sqlite/SQLite.h @@ -2,13 +2,14 @@ #pragma once +#include "zeek/zeek-config.h" + #include #include #include "zeek/3rdparty/sqlite3.h" #include "zeek/input/ReaderBackend.h" #include "zeek/threading/formatters/Ascii.h" -#include "zeek/zeek-config.h" namespace zeek::input::reader::detail { diff --git a/src/iosource/BPF_Program.cc b/src/iosource/BPF_Program.cc index 4607822197..13f15e14d8 100644 --- a/src/iosource/BPF_Program.cc +++ b/src/iosource/BPF_Program.cc @@ -2,10 +2,10 @@ #include "zeek/iosource/BPF_Program.h" -#include - #include "zeek/zeek-config.h" +#include + #ifdef DONT_HAVE_LIBPCAP_PCAP_FREECODE extern "C" { diff --git a/src/iosource/Manager.h b/src/iosource/Manager.h index d2caa8a777..cb8af3fe4c 100644 --- a/src/iosource/Manager.h +++ b/src/iosource/Manager.h @@ -2,13 +2,14 @@ #pragma once +#include "zeek/zeek-config.h" + #include #include #include #include "zeek/Flare.h" #include "zeek/iosource/IOSource.h" -#include "zeek/zeek-config.h" struct timespec; struct kevent; diff --git a/src/iosource/Packet.h b/src/iosource/Packet.h index 29b516c755..5145724a08 100644 --- a/src/iosource/Packet.h +++ b/src/iosource/Packet.h @@ -1,11 +1,11 @@ #pragma once +#include "zeek/zeek-config.h" + #include #include // for u_char #include -#include "zeek/zeek-config.h" - #if defined(__OpenBSD__) #include typedef struct bpf_timeval pkt_timeval; diff --git a/src/iosource/PktDumper.cc b/src/iosource/PktDumper.cc index fd0794483e..ec65615267 100644 --- a/src/iosource/PktDumper.cc +++ b/src/iosource/PktDumper.cc @@ -3,9 +3,10 @@ #include "zeek/iosource/PktDumper.h" -#include "zeek/DebugLogger.h" #include "zeek/zeek-config.h" +#include "zeek/DebugLogger.h" + namespace zeek::iosource { diff --git a/src/iosource/PktDumper.h b/src/iosource/PktDumper.h index 9e18fd8386..c39895e405 100644 --- a/src/iosource/PktDumper.h +++ b/src/iosource/PktDumper.h @@ -2,10 +2,10 @@ #pragma once -#include - #include "zeek/zeek-config.h" +#include + namespace zeek { diff --git a/src/iosource/PktSrc.cc b/src/iosource/PktSrc.cc index 79f042512a..663fec53ad 100644 --- a/src/iosource/PktSrc.cc +++ b/src/iosource/PktSrc.cc @@ -2,6 +2,8 @@ #include "zeek/iosource/PktSrc.h" +#include "zeek/zeek-config.h" + #include #include "zeek/Hash.h" @@ -13,7 +15,6 @@ #include "zeek/packet_analysis/Manager.h" #include "zeek/session/Manager.h" #include "zeek/util.h" -#include "zeek/zeek-config.h" namespace zeek::iosource { diff --git a/src/logging/Tag.h b/src/logging/Tag.h index 3b879ed3e8..e9ed93c03b 100644 --- a/src/logging/Tag.h +++ b/src/logging/Tag.h @@ -2,9 +2,10 @@ #pragma once -#include "zeek/Tag.h" #include "zeek/zeek-config.h" +#include "zeek/Tag.h" + namespace zeek { diff --git a/src/logging/writers/sqlite/SQLite.cc b/src/logging/writers/sqlite/SQLite.cc index 4ec1a23f3c..6bdaf718fa 100644 --- a/src/logging/writers/sqlite/SQLite.cc +++ b/src/logging/writers/sqlite/SQLite.cc @@ -2,13 +2,14 @@ #include "zeek/logging/writers/sqlite/SQLite.h" +#include "zeek/zeek-config.h" + #include #include #include #include "zeek/logging/writers/sqlite/sqlite.bif.h" #include "zeek/threading/SerialTypes.h" -#include "zeek/zeek-config.h" using namespace std; using zeek::threading::Field; diff --git a/src/logging/writers/sqlite/SQLite.h b/src/logging/writers/sqlite/SQLite.h index 06462a1e20..be4dcd6e97 100644 --- a/src/logging/writers/sqlite/SQLite.h +++ b/src/logging/writers/sqlite/SQLite.h @@ -4,11 +4,12 @@ #pragma once +#include "zeek/zeek-config.h" + #include "zeek/3rdparty/sqlite3.h" #include "zeek/Desc.h" #include "zeek/logging/WriterBackend.h" #include "zeek/threading/formatters/Ascii.h" -#include "zeek/zeek-config.h" namespace zeek::logging::writer::detail { diff --git a/src/main.cc b/src/main.cc index fdaf43e877..254fb14c58 100644 --- a/src/main.cc +++ b/src/main.cc @@ -1,9 +1,10 @@ // See the file "COPYING" in the main distribution directory for copyright. +#include "zeek/zeek-config.h" + #include "zeek/RunState.h" #include "zeek/iosource/Manager.h" #include "zeek/supervisor/Supervisor.h" -#include "zeek/zeek-config.h" #include "zeek/zeek-setup.h" int main(int argc, char** argv) diff --git a/src/net_util.cc b/src/net_util.cc index bdbe6bd1fb..7fc4084eea 100644 --- a/src/net_util.cc +++ b/src/net_util.cc @@ -2,6 +2,8 @@ #include "zeek/net_util.h" +#include "zeek/zeek-config.h" + #include #include #include @@ -10,7 +12,6 @@ #include "zeek/IP.h" #include "zeek/IPAddr.h" #include "zeek/Reporter.h" -#include "zeek/zeek-config.h" const char* transport_proto_string(TransportProto proto) { diff --git a/src/packet_analysis/Component.h b/src/packet_analysis/Component.h index a31a1b3c58..c58525e293 100644 --- a/src/packet_analysis/Component.h +++ b/src/packet_analysis/Component.h @@ -2,13 +2,14 @@ #pragma once +#include "zeek/zeek-config.h" + #include #include "zeek/packet_analysis/Tag.h" #include "zeek/plugin/Component.h" #include "zeek/plugin/TaggedComponent.h" #include "zeek/util.h" -#include "zeek/zeek-config.h" namespace zeek::packet_analysis { diff --git a/src/packet_analysis/Tag.h b/src/packet_analysis/Tag.h index 05bcdbb555..8feb482c06 100644 --- a/src/packet_analysis/Tag.h +++ b/src/packet_analysis/Tag.h @@ -2,9 +2,10 @@ #pragma once -#include "zeek/Tag.h" #include "zeek/zeek-config.h" +#include "zeek/Tag.h" + namespace zeek::plugin { template class TaggedComponent; diff --git a/src/plugin/Component.h b/src/plugin/Component.h index 44e61d4430..bb9b585f5b 100644 --- a/src/plugin/Component.h +++ b/src/plugin/Component.h @@ -2,10 +2,10 @@ #pragma once -#include - #include "zeek/zeek-config.h" +#include + namespace zeek { diff --git a/src/plugin/Plugin.h b/src/plugin/Plugin.h index 615e7c30d9..ac21e99645 100644 --- a/src/plugin/Plugin.h +++ b/src/plugin/Plugin.h @@ -2,13 +2,14 @@ #pragma once +#include "zeek/zeek-config.h" + #include #include #include #include "zeek/ZeekArgs.h" #include "zeek/logging/WriterBackend.h" -#include "zeek/zeek-config.h" // Increase this when making incompatible changes to the plugin API. Note // that the constant is never used in C code. It's picked up on by CMake. diff --git a/src/probabilistic/BloomFilter.h b/src/probabilistic/BloomFilter.h index 4ab3079f55..c67b6674c5 100644 --- a/src/probabilistic/BloomFilter.h +++ b/src/probabilistic/BloomFilter.h @@ -2,6 +2,8 @@ #pragma once +#include "zeek/zeek-config.h" + #include #include #include @@ -9,7 +11,6 @@ #include "zeek/probabilistic/BitVector.h" #include "zeek/probabilistic/Hasher.h" -#include "zeek/zeek-config.h" namespace broker { diff --git a/src/probabilistic/CounterVector.h b/src/probabilistic/CounterVector.h index cdd61c5089..0f43b20582 100644 --- a/src/probabilistic/CounterVector.h +++ b/src/probabilistic/CounterVector.h @@ -2,13 +2,13 @@ #pragma once +#include "zeek/zeek-config.h" + #include #include #include #include -#include "zeek/zeek-config.h" - namespace broker { class data; diff --git a/src/session/Manager.cc b/src/session/Manager.cc index cc5805b439..47f5b7d239 100644 --- a/src/session/Manager.cc +++ b/src/session/Manager.cc @@ -2,6 +2,8 @@ #include "zeek/session/Manager.h" +#include "zeek/zeek-config.h" + #include #include #include @@ -21,7 +23,6 @@ #include "zeek/packet_analysis/Manager.h" #include "zeek/session/Session.h" #include "zeek/telemetry/Manager.h" -#include "zeek/zeek-config.h" zeek::session::Manager* zeek::session_mgr = nullptr; zeek::session::Manager*& zeek::sessions = zeek::session_mgr; diff --git a/src/supervisor/Supervisor.cc b/src/supervisor/Supervisor.cc index b50477f2fc..ab905f4ade 100644 --- a/src/supervisor/Supervisor.cc +++ b/src/supervisor/Supervisor.cc @@ -2,6 +2,8 @@ #include "zeek/supervisor/Supervisor.h" +#include "zeek/zeek-config.h" + #include #include #include @@ -14,8 +16,6 @@ #include #include -#include "zeek/zeek-config.h" - #define RAPIDJSON_HAS_STDSTRING 1 #include diff --git a/src/threading/BasicThread.cc b/src/threading/BasicThread.cc index 1df400bbdb..8385c5264f 100644 --- a/src/threading/BasicThread.cc +++ b/src/threading/BasicThread.cc @@ -1,11 +1,12 @@ #include "zeek/threading/BasicThread.h" +#include "zeek/zeek-config.h" + #include #include #include "zeek/threading/Manager.h" #include "zeek/util.h" -#include "zeek/zeek-config.h" namespace zeek::threading { diff --git a/src/threading/BasicThread.h b/src/threading/BasicThread.h index 576ee3c084..f009a457df 100644 --- a/src/threading/BasicThread.h +++ b/src/threading/BasicThread.h @@ -1,12 +1,12 @@ #pragma once +#include "zeek/zeek-config.h" + #include #include #include -#include "zeek/zeek-config.h" - namespace zeek::threading { diff --git a/src/threading/Formatter.cc b/src/threading/Formatter.cc index 0a63431354..680a4ece4c 100644 --- a/src/threading/Formatter.cc +++ b/src/threading/Formatter.cc @@ -2,11 +2,12 @@ #include "zeek/threading/Formatter.h" +#include "zeek/zeek-config.h" + #include #include "zeek/bro_inet_ntop.h" #include "zeek/threading/MsgThread.h" -#include "zeek/zeek-config.h" using zeek::threading::Field; using zeek::threading::Value; diff --git a/src/threading/formatters/Ascii.cc b/src/threading/formatters/Ascii.cc index 70d3a574ee..9663ec560e 100644 --- a/src/threading/formatters/Ascii.cc +++ b/src/threading/formatters/Ascii.cc @@ -2,12 +2,13 @@ #include "threading/formatters/Ascii.h" +#include "zeek/zeek-config.h" + #include #include #include "zeek/Desc.h" #include "zeek/threading/MsgThread.h" -#include "zeek/zeek-config.h" using namespace std; diff --git a/src/zeek-setup.cc b/src/zeek-setup.cc index 745ddf9c0c..07671948b1 100644 --- a/src/zeek-setup.cc +++ b/src/zeek-setup.cc @@ -2,6 +2,8 @@ #include "zeek/zeek-setup.h" +#include "zeek/zeek-config.h" + #include #include #include @@ -14,7 +16,6 @@ #include #include "zeek/3rdparty/sqlite3.h" -#include "zeek/zeek-config.h" #define DOCTEST_CONFIG_IMPLEMENT #include "zeek/3rdparty/doctest.h" diff --git a/src/zeekygen/ScriptInfo.h b/src/zeekygen/ScriptInfo.h index 024bc31ed0..1042c51239 100644 --- a/src/zeekygen/ScriptInfo.h +++ b/src/zeekygen/ScriptInfo.h @@ -2,6 +2,8 @@ #pragma once +#include "zeek/zeek-config.h" + #include // for time_t #include #include @@ -9,7 +11,6 @@ #include #include -#include "zeek/zeek-config.h" #include "zeek/zeekygen/Info.h" namespace zeek::zeekygen::detail diff --git a/src/zeekygen/Target.h b/src/zeekygen/Target.h index c681e87027..1008cc4fe2 100644 --- a/src/zeekygen/Target.h +++ b/src/zeekygen/Target.h @@ -2,13 +2,13 @@ #pragma once +#include "zeek/zeek-config.h" + #include #include #include #include -#include "zeek/zeek-config.h" - namespace zeek::zeekygen::detail { diff --git a/src/zeekygen/utils.h b/src/zeekygen/utils.h index 198e136ef8..ebcc2b9095 100644 --- a/src/zeekygen/utils.h +++ b/src/zeekygen/utils.h @@ -2,12 +2,12 @@ #pragma once +#include "zeek/zeek-config.h" + #include // for time_t #include #include -#include "zeek/zeek-config.h" - namespace zeek::detail { class ID;