clang-format: Force zeek-config.h to be earlier in the config ordering

.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

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
 	{

src/Base64.cc

@@ -1,11 +1,12 @@
 #include "zeek/Base64.h"
 
+#include "zeek/zeek-config.h"
+
 #include <math.h>
 
 #include "zeek/Conn.h"
 #include "zeek/Reporter.h"
 #include "zeek/ZeekString.h"
-#include "zeek/zeek-config.h"
 
 namespace zeek::detail
 	{

src/Base64.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include <string>
-
 #include "zeek/zeek-config.h"
 
+#include <string>
+
 namespace zeek
 	{
 

src/BifReturnVal.h

@@ -2,9 +2,10 @@
 
 #pragma once
 
-#include "zeek/IntrusivePtr.h"
 #include "zeek/zeek-config.h"
 
+#include "zeek/IntrusivePtr.h"
+
 namespace zeek
 	{
 

src/CCL.cc

@@ -2,11 +2,12 @@
 
 #include "zeek/CCL.h"
 
+#include "zeek/zeek-config.h"
+
 #include <algorithm>
 
 #include "zeek/DFA.h"
 #include "zeek/RE.h"
-#include "zeek/zeek-config.h"
 
 namespace zeek::detail
 	{

src/CompHash.cc

@@ -2,6 +2,8 @@
 
 #include "zeek/CompHash.h"
 
+#include "zeek/zeek-config.h"
+
 #include <cstring>
 #include <map>
 #include <vector>
@@ -13,7 +15,6 @@
 #include "zeek/Reporter.h"
 #include "zeek/Val.h"
 #include "zeek/ZeekString.h"
-#include "zeek/zeek-config.h"
 
 namespace zeek::detail
 	{

src/Conn.cc

@@ -2,6 +2,8 @@
 
 #include "zeek/Conn.h"
 
+#include "zeek/zeek-config.h"
+
 #include <binpac.h>
 #include <ctype.h>
 
@@ -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
 	{

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
 	{

src/DNS_Mgr.cc

@@ -2,10 +2,10 @@
 
 #include "zeek/DNS_Mgr.h"
 
+#include "zeek/zeek-config.h"
+
 #include <sys/socket.h>
 #include <sys/types.h>
-
-#include "zeek/zeek-config.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
 #include <time.h>

src/DbgBreakpoint.cc

@@ -2,6 +2,8 @@
 
 #include "zeek/DbgBreakpoint.h"
 
+#include "zeek/zeek-config.h"
+
 #include <assert.h>
 
 #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
 	{

src/DbgHelp.cc

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

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
 	{

src/Debug.cc

@@ -2,14 +2,14 @@
 
 #include "zeek/Debug.h"
 
+#include "zeek/zeek-config.h"
+
 #include <ctype.h>
 #include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <string>
 
-#include "zeek/zeek-config.h"
-
 #ifdef HAVE_READLINE
 #include <readline/history.h>
 #include <readline/readline.h>

src/DebugCmds.cc

@@ -3,6 +3,8 @@
 
 #include "zeek/DebugCmds.h"
 
+#include "zeek/zeek-config.h"
+
 #include <assert.h>
 #include <regex.h>
 #include <string.h>
@@ -21,7 +23,6 @@
 #include "zeek/Stmt.h"
 #include "zeek/Val.h"
 #include "zeek/util.h"
-#include "zeek/zeek-config.h"
 
 using namespace std;
 

src/DebugLogger.h

@@ -5,12 +5,12 @@
 
 #ifdef DEBUG
 
+#include "zeek/zeek-config.h"
+
 #include <stdio.h>
 #include <set>
 #include <string>
 
-#include "zeek/zeek-config.h"
-
 #define DBG_LOG(stream, args...)                                                                   \
 	if ( ::zeek::detail::debug_logger.IsEnabled(stream) )                                          \
 	::zeek::detail::debug_logger.Log(stream, args)

src/Desc.cc

@@ -2,6 +2,8 @@
 
 #include "zeek/Desc.h"
 
+#include "zeek/zeek-config.h"
+
 #include <errno.h>
 #include <math.h>
 #include <stdlib.h>
@@ -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

src/Discard.cc

@@ -2,6 +2,8 @@
 
 #include "zeek/Discard.h"
 
+#include "zeek/zeek-config.h"
+
 #include <algorithm>
 
 #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
 	{

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
 	{

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;

src/EventRegistry.h

@@ -2,14 +2,14 @@
 
 #pragma once
 
+#include "zeek/zeek-config.h"
+
 #include <map>
 #include <memory>
 #include <string>
 #include <string_view>
 #include <vector>
 
-#include "zeek/zeek-config.h"
-
 namespace zeek
 	{
 

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
 	{

src/File.cc

@@ -2,9 +2,9 @@
 
 #include "zeek/File.h"
 
-#include <sys/types.h>
-
 #include "zeek/zeek-config.h"
+
+#include <sys/types.h>
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
 #include <time.h>

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;

src/Func.cc

@@ -3,10 +3,10 @@
 
 #include "zeek/Func.h"
 
+#include "zeek/zeek-config.h"
+
 #include <sys/stat.h>
 #include <sys/types.h>
-
-#include "zeek/zeek-config.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
 #include <time.h>

src/Hash.cc

@@ -2,6 +2,8 @@
 
 #include "zeek/Hash.h"
 
+#include "zeek/zeek-config.h"
+
 #include <highwayhash/highwayhash_target.h>
 #include <highwayhash/instruction_sets.h>
 #include <highwayhash/sip_hash.h>
@@ -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"
 

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"

src/IP.h

@@ -2,11 +2,11 @@
 
 #pragma once
 
-#include <sys/types.h> // for u_char
+#include "zeek/zeek-config.h"
+
 #include <netinet/in.h>
 #include <netinet/ip.h>
-
-#include "zeek/zeek-config.h"
+#include <sys/types.h> // for u_char
 
 #ifdef HAVE_NETINET_IP6_H
 #include <netinet/ip6.h>

src/NFA.cc

@@ -2,12 +2,13 @@
 
 #include "zeek/NFA.h"
 
+#include "zeek/zeek-config.h"
+
 #include <algorithm>
 
 #include "zeek/Desc.h"
 #include "zeek/EquivClass.h"
 #include "zeek/IntSet.h"
-#include "zeek/zeek-config.h"
 
 namespace zeek::detail
 	{

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;

src/Obj.cc

@@ -2,13 +2,14 @@
 
 #include "zeek/Obj.h"
 
+#include "zeek/zeek-config.h"
+
 #include <stdlib.h>
 
 #include "zeek/Desc.h"
 #include "zeek/File.h"
 #include "zeek/Func.h"
 #include "zeek/plugin/Manager.h"
-#include "zeek/zeek-config.h"
 
 namespace zeek
 	{

src/Obj.h

@@ -2,10 +2,10 @@
 
 #pragma once
 
-#include <limits.h>
-
 #include "zeek/zeek-config.h"
 
+#include <limits.h>
+
 namespace zeek
 	{
 

src/Options.cc

@@ -2,10 +2,11 @@
 
 #include "zeek/Options.h"
 
+#include "zeek/zeek-config.h"
+
 #include <unistd.h>
 
 #include "zeek/script_opt/ScriptOpt.h"
-#include "zeek/zeek-config.h"
 
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>

src/PolicyFile.cc

@@ -1,5 +1,7 @@
 #include "zeek/PolicyFile.h"
 
+#include "zeek/zeek-config.h"
+
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
@@ -12,7 +14,6 @@
 #include "zeek/Debug.h"
 #include "zeek/Reporter.h"
 #include "zeek/util.h"
-#include "zeek/zeek-config.h"
 
 using namespace std;
 

src/PriorityQueue.cc

@@ -2,12 +2,13 @@
 
 #include "zeek/PriorityQueue.h"
 
+#include "zeek/zeek-config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 
 #include "zeek/Reporter.h"
 #include "zeek/util.h"
-#include "zeek/zeek-config.h"
 
 namespace zeek::detail
 	{

src/PriorityQueue.h

@@ -2,11 +2,11 @@
 
 #pragma once
 
+#include "zeek/zeek-config.h"
+
 #include <math.h>
 #include <stdint.h>
 
-#include "zeek/zeek-config.h"
-
 namespace zeek::detail
 	{
 

src/RE.cc

@@ -2,6 +2,8 @@
 
 #include "zeek/RE.h"
 
+#include "zeek/zeek-config.h"
+
 #include <stdlib.h>
 #include <utility>
 
@@ -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;

src/RandTest.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include <stdint.h>
-
 #include "zeek/zeek-config.h"
 
+#include <stdint.h>
+
 #define RT_MONTEN                                                                                  \
 	6 /* Bytes used as Monte Carlo                                                                 \
 	     co-ordinates. This should be no more                                                      \

src/Reassem.cc

@@ -2,10 +2,11 @@
 
 #include "zeek/Reassem.h"
 
+#include "zeek/zeek-config.h"
+
 #include <algorithm>
 
 #include "zeek/Desc.h"
-#include "zeek/zeek-config.h"
 
 using std::min;
 

src/Reporter.cc

@@ -4,6 +4,8 @@
 
 #include "zeek/Reporter.h"
 
+#include "zeek/zeek-config.h"
+
 #include <syslog.h>
 #include <unistd.h>
 
@@ -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"

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
 	{

src/RuleAction.cc

@@ -1,5 +1,7 @@
 #include "zeek/RuleAction.h"
 
+#include "zeek/zeek-config.h"
+
 #include <string>
 
 #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;
 

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)
 	{

src/RuleMatcher.cc

@@ -1,6 +1,8 @@
 
 #include "zeek/RuleMatcher.h"
 
+#include "zeek/zeek-config.h"
+
 #include <algorithm>
 #include <functional>
 
@@ -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;
 

src/RunState.cc

@@ -2,9 +2,9 @@
 
 #include "zeek/RunState.h"
 
-#include <sys/types.h>
-
 #include "zeek/zeek-config.h"
+
+#include <sys/types.h>
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
 #include <time.h>

src/RunState.h

@@ -2,11 +2,11 @@
 
 #pragma once
 
+#include "zeek/zeek-config.h"
+
 #include <optional>
 #include <string>
 
-#include "zeek/zeek-config.h"
-
 namespace zeek
 	{
 

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
 	{

src/SerializationFormat.h

@@ -2,11 +2,11 @@
 
 #pragma once
 
+#include "zeek/zeek-config.h"
+
 #include <stdint.h>
 #include <string>
 
-#include "zeek/zeek-config.h"
-
 struct in_addr;
 struct in6_addr;
 

src/SmithWaterman.cc

@@ -2,6 +2,8 @@
 
 #include "zeek/SmithWaterman.h"
 
+#include "zeek/zeek-config.h"
+
 #include <ctype.h>
 #include <algorithm>
 
@@ -9,7 +11,6 @@
 #include "zeek/Val.h"
 #include "zeek/Var.h"
 #include "zeek/util.h"
-#include "zeek/zeek-config.h"
 
 namespace zeek::detail
 	{

src/Stats.h

@@ -2,13 +2,13 @@
 
 #pragma once
 
+#include "zeek/zeek-config.h"
+
 #include <stdint.h>
 #include <sys/resource.h>
 #include <sys/time.h>
 #include <sys/types.h>
 
-#include "zeek/zeek-config.h"
-
 namespace zeek
 	{
 

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
 	{

src/Tag.h

@@ -2,12 +2,13 @@
 
 #pragma once
 
+#include "zeek/zeek-config.h"
+
 #include <stdint.h>
 #include <string>
 
 #include "zeek/IntrusivePtr.h"
 #include "zeek/util.h"
-#include "zeek/zeek-config.h"
 
 namespace zeek
 	{

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
 	{

src/TunnelEncapsulation.h

@@ -2,13 +2,14 @@
 
 #pragma once
 
+#include "zeek/zeek-config.h"
+
 #include <vector>
 
 #include "zeek/ID.h"
 #include "zeek/IPAddr.h"
 #include "zeek/NetVar.h"
 #include "zeek/UID.h"
-#include "zeek/zeek-config.h"
 
 namespace zeek
 	{

src/Type.cc

@@ -2,6 +2,8 @@
 
 #include "zeek/Type.h"
 
+#include "zeek/zeek-config.h"
+
 #include <list>
 #include <map>
 #include <string>
@@ -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"

src/Val.cc

@@ -2,6 +2,8 @@
 
 #include "zeek/Val.h"
 
+#include "zeek/zeek-config.h"
+
 #include <netdb.h>
 #include <netinet/in.h>
 #include <stdio.h>
@@ -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;
 

src/Var.cc

@@ -2,6 +2,8 @@
 
 #include "zeek/Var.h"
 
+#include "zeek/zeek-config.h"
+
 #include <memory>
 
 #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
 	{

src/ZeekString.cc

@@ -2,6 +2,8 @@
 
 #include "zeek/ZeekString.h"
 
+#include "zeek/zeek-config.h"
+
 #include <ctype.h>
 #include <algorithm>
 #include <iostream>
@@ -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)

src/ZeekString.h

@@ -2,13 +2,13 @@
 
 #pragma once
 
+#include "zeek/zeek-config.h"
+
 #include <sys/types.h>
 #include <iosfwd>
 #include <string>
 #include <vector>
 
-#include "zeek/zeek-config.h"
-
 namespace zeek
 	{
 

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
 	{

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
 	{
 

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 <stdlib.h>
 #include <map>
 #include <string>
 
-#include "zeek/zeek-config.h"
-
 using namespace std;
 
 namespace zeek::analyzer::dce_rpc

src/analyzer/protocol/dns/DNS.cc

@@ -2,6 +2,8 @@
 
 #include "zeek/analyzer/protocol/dns/DNS.h"
 
+#include "zeek/zeek-config.h"
+
 #include <arpa/inet.h>
 #include <ctype.h>
 #include <netinet/in.h>
@@ -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
 	{

src/analyzer/protocol/finger/Finger.cc

@@ -2,13 +2,14 @@
 
 #include "zeek/analyzer/protocol/finger/Finger.h"
 
+#include "zeek/zeek-config.h"
+
 #include <ctype.h>
 
 #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
 	{

src/analyzer/protocol/ftp/FTP.cc

@@ -2,6 +2,8 @@
 
 #include "zeek/analyzer/protocol/ftp/FTP.h"
 
+#include "zeek/zeek-config.h"
+
 #include <stdlib.h>
 
 #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
 	{

src/analyzer/protocol/gnutella/Gnutella.cc

@@ -2,6 +2,8 @@
 
 #include "zeek/analyzer/protocol/gnutella/Gnutella.h"
 
+#include "zeek/zeek-config.h"
+
 #include <ctype.h>
 #include <algorithm>
 
@@ -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
 	{

src/analyzer/protocol/http/HTTP.cc

@@ -2,6 +2,8 @@
 
 #include "zeek/analyzer/protocol/http/HTTP.h"
 
+#include "zeek/zeek-config.h"
+
 #include <ctype.h>
 #include <math.h>
 #include <stdlib.h>
@@ -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
 	{

src/analyzer/protocol/ident/Ident.cc

@@ -2,13 +2,14 @@
 
 #include "zeek/analyzer/protocol/ident/Ident.h"
 
+#include "zeek/zeek-config.h"
+
 #include <ctype.h>
 
 #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
 	{

src/analyzer/protocol/krb/KRB.h

@@ -2,10 +2,10 @@
 
 #pragma once
 
-#include <mutex>
-
 #include "zeek/zeek-config.h"
 
+#include <mutex>
+
 #ifdef USE_KRB5
 #include <krb5.h>
 #endif

src/analyzer/protocol/login/Login.cc

@@ -2,6 +2,8 @@
 
 #include "zeek/analyzer/protocol/login/Login.h"
 
+#include "zeek/zeek-config.h"
+
 #include <ctype.h>
 #include <stdlib.h>
 
@@ -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
 	{

src/analyzer/protocol/login/NVT.cc

@@ -2,6 +2,8 @@
 
 #include "zeek/analyzer/protocol/login/NVT.h"
 
+#include "zeek/zeek-config.h"
+
 #include <stdlib.h>
 
 #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)
 

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
 	{

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
 	{

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
 	{

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:
 //

src/analyzer/protocol/ncp/NCP.cc

@@ -2,13 +2,14 @@
 
 #include "zeek/analyzer/protocol/ncp/NCP.h"
 
+#include "zeek/zeek-config.h"
+
 #include <stdlib.h>
 #include <map>
 #include <string>
 
 #include "zeek/analyzer/protocol/ncp/consts.bif.h"
 #include "zeek/analyzer/protocol/ncp/events.bif.h"
-#include "zeek/zeek-config.h"
 
 using namespace std;
 

src/analyzer/protocol/netbios/NetbiosSSN.cc

@@ -2,6 +2,8 @@
 
 #include "zeek/analyzer/protocol/netbios/NetbiosSSN.h"
 
+#include "zeek/zeek-config.h"
+
 #include <ctype.h>
 
 #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;
 

src/analyzer/protocol/pop3/POP3.cc

@@ -3,6 +3,8 @@
 
 #include "zeek/analyzer/protocol/pop3/POP3.h"
 
+#include "zeek/zeek-config.h"
+
 #include <ctype.h>
 #include <string>
 #include <vector>
@@ -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
 	{

src/analyzer/protocol/rpc/MOUNT.cc

@@ -2,6 +2,8 @@
 
 #include "zeek/analyzer/protocol/rpc/MOUNT.h"
 
+#include "zeek/zeek-config.h"
+
 #include <algorithm>
 #include <vector>
 
@@ -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
 	{

src/analyzer/protocol/rpc/NFS.cc

@@ -2,6 +2,8 @@
 
 #include "zeek/analyzer/protocol/rpc/NFS.h"
 
+#include "zeek/zeek-config.h"
+
 #include <utility>
 #include <vector>
 
@@ -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
 	{

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

src/analyzer/protocol/rpc/RPC.cc

@@ -2,6 +2,8 @@
 
 #include "zeek/analyzer/protocol/rpc/RPC.h"
 
+#include "zeek/zeek-config.h"
+
 #include <stdlib.h>
 #include <string>
 
@@ -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

src/analyzer/protocol/rpc/XDR.cc

@@ -2,11 +2,12 @@
 
 #include "zeek/analyzer/protocol/rpc/XDR.h"
 
+#include "zeek/zeek-config.h"
+
 #include <string.h>
 #include <algorithm>
 
 #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)
 	{

src/analyzer/protocol/smtp/SMTP.cc

@@ -2,6 +2,8 @@
 
 #include "zeek/analyzer/protocol/smtp/SMTP.h"
 
+#include "zeek/zeek-config.h"
+
 #include <stdlib.h>
 
 #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,

src/analyzer/protocol/zip/ZIP.h

@@ -2,10 +2,11 @@
 
 #pragma once
 
+#include "zeek/zeek-config.h"
+
 #include <zlib.h>
 
 #include "zeek/analyzer/protocol/tcp/TCP.h"
-#include "zeek/zeek-config.h"
 
 namespace zeek::analyzer::zip
 	{

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

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
 	{

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 T> class TaggedComponent;

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
 	{
 

src/input/readers/sqlite/SQLite.cc

@@ -2,6 +2,8 @@
 
 #include "zeek/input/readers/sqlite/SQLite.h"
 
+#include "zeek/zeek-config.h"
+
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -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;

src/input/readers/sqlite/SQLite.h

@@ -2,13 +2,14 @@
 
 #pragma once
 
+#include "zeek/zeek-config.h"
+
 #include <iostream>
 #include <vector>
 
 #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
 	{

src/iosource/BPF_Program.cc

@@ -2,10 +2,10 @@
 
 #include "zeek/iosource/BPF_Program.h"
 
-#include <string.h>
-
 #include "zeek/zeek-config.h"
 
+#include <string.h>
+
 #ifdef DONT_HAVE_LIBPCAP_PCAP_FREECODE
 extern "C"
 	{

src/iosource/Manager.h

@@ -2,13 +2,14 @@
 
 #pragma once
 
+#include "zeek/zeek-config.h"
+
 #include <map>
 #include <string>
 #include <vector>
 
 #include "zeek/Flare.h"
 #include "zeek/iosource/IOSource.h"
-#include "zeek/zeek-config.h"
 
 struct timespec;
 struct kevent;

src/iosource/Packet.h

@@ -1,11 +1,11 @@
 #pragma once
 
+#include "zeek/zeek-config.h"
+
 #include <stdint.h>
 #include <sys/types.h> // for u_char
 #include <string>
 
-#include "zeek/zeek-config.h"
-
 #if defined(__OpenBSD__)
 #include <net/bpf.h>
 typedef struct bpf_timeval pkt_timeval;

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
 	{
 

src/iosource/PktDumper.h

@@ -2,10 +2,10 @@
 
 #pragma once
 
-#include <string>
-
 #include "zeek/zeek-config.h"
 
+#include <string>
+
 namespace zeek
 	{
 

src/iosource/PktSrc.cc

@@ -2,6 +2,8 @@
 
 #include "zeek/iosource/PktSrc.h"
 
+#include "zeek/zeek-config.h"
+
 #include <sys/stat.h>
 
 #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
 	{

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
 	{
 

src/logging/writers/sqlite/SQLite.cc

@@ -2,13 +2,14 @@
 
 #include "zeek/logging/writers/sqlite/SQLite.h"
 
+#include "zeek/zeek-config.h"
+
 #include <errno.h>
 #include <string>
 #include <vector>
 
 #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;

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
 	{