Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/timw/include-cleanup-part-2'

Browse source 
* origin/topic/timw/include-cleanup-part-2:
  Remove unnecessary #includes in script_opt
  Remove unnecessary #includes in telemetry and supervisor
  Remove unnecessary #includes in cluster/broker/iosource/probabilistic/session
  Remove unnecessary #includes in zeekygen and base plugin files
  Remove unnecessary #includes in input/logging/threading
  Remove unnecessary #includes in analyzer/packet analyzer/file analyzer source files
  Remove unnecessary #includes in analyzer/packet analyzer/file analyzer headers
  Remove unnecessary #includes in base files in repo
This commit is contained in:
Tim Wojtulewicz 2025-05-19 10:25:34 -07:00
commit cc79afd24f
311 changed files with 139 additions and 539 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,3 +1,7 @@
8.0.0-dev.130 | 2025-05-19 10:25:34 -0700
* Remove unnecessary #includes across the repo (Tim Wojtulewicz, Corelight)
8.0.0-dev.121 | 2025-05-19 09:43:59 -0700 8.0.0-dev.121 | 2025-05-19 09:43:59 -0700
* Rename CI-related github labels for PRs (Tim Wojtulewicz, Corelight) * Rename CI-related github labels for PRs (Tim Wojtulewicz, Corelight)

2
VERSION
View file

@ -1 +1 @@
8.0.0-dev.121 8.0.0-dev.130

2
src/Attr.cc
View file

@ -2,8 +2,6 @@
#include "zeek/Attr.h" #include "zeek/Attr.h"
#include "zeek/zeek-config.h"
#include "zeek/Desc.h" #include "zeek/Desc.h"
#include "zeek/Expr.h" #include "zeek/Expr.h"
#include "zeek/IntrusivePtr.h" #include "zeek/IntrusivePtr.h"

2
src/Base64.cc
View file

@ -2,8 +2,6 @@
#include "zeek/Base64.h" #include "zeek/Base64.h"
#include "zeek/zeek-config.h"
#include <cmath> #include <cmath>
#include "zeek/Conn.h" #include "zeek/Conn.h"

2
src/Base64.h
View file

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

4
src/CCL.cc
View file

@ -2,11 +2,9 @@
#include "zeek/CCL.h" #include "zeek/CCL.h"
#include "zeek/zeek-config.h"
#include <algorithm> #include <algorithm>
#include "zeek/DFA.h" #include "zeek/NFA.h" // for SYM_BOL and SYM_EOL
#include "zeek/RE.h" #include "zeek/RE.h"
namespace zeek::detail { namespace zeek::detail {

2
src/CompHash.cc
View file

@ -2,8 +2,6 @@
#include "zeek/CompHash.h" #include "zeek/CompHash.h"
#include "zeek/zeek-config.h"
#include <cstring> #include <cstring>
#include <map> #include <map>
#include <vector> #include <vector>

4
src/Conn.cc
View file

@ -2,13 +2,10 @@
#include "zeek/Conn.h" #include "zeek/Conn.h"
#include "zeek/zeek-config.h"
#include <binpac.h> #include <binpac.h>
#include <cctype> #include <cctype>
#include "zeek/Desc.h" #include "zeek/Desc.h"
#include "zeek/Event.h"
#include "zeek/NetVar.h" #include "zeek/NetVar.h"
#include "zeek/Reporter.h" #include "zeek/Reporter.h"
#include "zeek/RunState.h" #include "zeek/RunState.h"
@ -17,7 +14,6 @@
#include "zeek/analyzer/Analyzer.h" #include "zeek/analyzer/Analyzer.h"
#include "zeek/analyzer/Manager.h" #include "zeek/analyzer/Manager.h"
#include "zeek/analyzer/protocol/pia/PIA.h" #include "zeek/analyzer/protocol/pia/PIA.h"
#include "zeek/iosource/IOSource.h"
#include "zeek/packet_analysis/protocol/ip/SessionAdapter.h" #include "zeek/packet_analysis/protocol/ip/SessionAdapter.h"
#include "zeek/packet_analysis/protocol/tcp/TCP.h" #include "zeek/packet_analysis/protocol/tcp/TCP.h"
#include "zeek/session/Manager.h" #include "zeek/session/Manager.h"

2
src/Conn.h
View file

@ -4,8 +4,6 @@
#include <sys/types.h> #include <sys/types.h>
#include <string> #include <string>
#include <tuple>
#include <type_traits>
#include "zeek/IPAddr.h" #include "zeek/IPAddr.h"
#include "zeek/IntrusivePtr.h" #include "zeek/IntrusivePtr.h"

1
src/DNS_Mgr.cc
View file

@ -38,7 +38,6 @@ using ztd::out_ptr::out_ptr;
#include "zeek/Hash.h" #include "zeek/Hash.h"
#include "zeek/ID.h" #include "zeek/ID.h"
#include "zeek/IntrusivePtr.h" #include "zeek/IntrusivePtr.h"
#include "zeek/NetVar.h"
#include "zeek/Reporter.h" #include "zeek/Reporter.h"
#include "zeek/RunState.h" #include "zeek/RunState.h"
#include "zeek/Val.h" #include "zeek/Val.h"

2
src/DNS_Mgr.h
View file

@ -5,13 +5,11 @@
#include <netdb.h> #include <netdb.h>
#include <list> #include <list>
#include <map> #include <map>
#include <queue>
#include <utility> #include <utility>
#include <variant> #include <variant>
#include "zeek/EventHandler.h" #include "zeek/EventHandler.h"
#include "zeek/IPAddr.h" #include "zeek/IPAddr.h"
#include "zeek/List.h"
#include "zeek/iosource/IOSource.h" #include "zeek/iosource/IOSource.h"
#include "zeek/util.h" #include "zeek/util.h"

3
src/DbgBreakpoint.cc
View file

@ -4,8 +4,6 @@
#include "zeek/DbgBreakpoint.h" #include "zeek/DbgBreakpoint.h"
#include "zeek/zeek-config.h"
#include <cassert> #include <cassert>
#include "zeek/Debug.h" #include "zeek/Debug.h"
@ -15,7 +13,6 @@
#include "zeek/ID.h" #include "zeek/ID.h"
#include "zeek/Reporter.h" #include "zeek/Reporter.h"
#include "zeek/Scope.h" #include "zeek/Scope.h"
#include "zeek/Stmt.h"
#include "zeek/Timer.h" #include "zeek/Timer.h"
#include "zeek/Val.h" #include "zeek/Val.h"
#include "zeek/module_util.h" #include "zeek/module_util.h"

3
src/DbgBreakpoint.h
View file

@ -4,10 +4,9 @@
#pragma once #pragma once
#include <cstdint>
#include <string> #include <string>
#include "zeek/util.h"
namespace zeek::detail { namespace zeek::detail {
class Stmt; class Stmt;

2
src/DbgWatch.cc
View file

@ -4,8 +4,6 @@
#include "zeek/DbgWatch.h" #include "zeek/DbgWatch.h"
#include "zeek/zeek-config.h"
#include "zeek/Debug.h" #include "zeek/Debug.h"
#include "zeek/Reporter.h" #include "zeek/Reporter.h"

2
src/DbgWatch.h
View file

@ -4,8 +4,6 @@
#pragma once #pragma once
#include "zeek/util.h"
namespace zeek { namespace zeek {
class Obj; class Obj;
} }

2
src/Debug.cc
View file

@ -4,8 +4,6 @@
#include "zeek/Debug.h" #include "zeek/Debug.h"
#include "zeek/zeek-config.h"
#include <cctype> #include <cctype>
#include <csignal> #include <csignal>
#include <cstdarg> #include <cstdarg>

6
src/Debug.h
View file

@ -4,6 +4,7 @@
#pragma once #pragma once
#include <cstdint>
#include <deque> #include <deque>
#include <map> #include <map>
#include <string> #include <string>
@ -11,7 +12,10 @@
#include "zeek/Obj.h" #include "zeek/Obj.h"
#include "zeek/StmtEnums.h" #include "zeek/StmtEnums.h"
#include "zeek/util.h"
#ifdef _MSC_VER
#include <unistd.h> // Needed to ignore __attribute__((format(printf))) on MSVC
#endif
namespace zeek { namespace zeek {

3
src/DebugCmds.cc
View file

@ -5,8 +5,6 @@
#include "zeek/DebugCmds.h" #include "zeek/DebugCmds.h"
#include "zeek/zeek-config.h"
#include <regex.h> #include <regex.h>
#include <sys/types.h> #include <sys/types.h>
#include <cassert> #include <cassert>
@ -22,7 +20,6 @@
#include "zeek/PolicyFile.h" #include "zeek/PolicyFile.h"
#include "zeek/Reporter.h" #include "zeek/Reporter.h"
#include "zeek/Scope.h" #include "zeek/Scope.h"
#include "zeek/Stmt.h"
#include "zeek/Val.h" #include "zeek/Val.h"
#include "zeek/util.h" #include "zeek/util.h"

6
src/DebugLogger.h
View file

@ -7,13 +7,13 @@
#ifdef DEBUG #ifdef DEBUG
#include "zeek/zeek-config.h"
#include <cstdio> #include <cstdio>
#include <set> #include <set>
#include <string> #include <string>
#include "zeek/util.h" #ifdef _MSC_VER
#include <unistd.h> // Needed to ignore __attribute__((format(printf))) on MSVC
#endif
#define DBG_LOG(stream, ...) \ #define DBG_LOG(stream, ...) \
if ( ::zeek::detail::debug_logger.IsEnabled(stream) ) \ if ( ::zeek::detail::debug_logger.IsEnabled(stream) ) \

3
src/Desc.cc
View file

@ -2,14 +2,11 @@
#include "zeek/Desc.h" #include "zeek/Desc.h"
#include "zeek/zeek-config.h"
#include <cerrno> #include <cerrno>
#include <cmath> #include <cmath>
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <cstring>
#include "zeek/3rdparty/ConvertUTF.h"
#include "zeek/File.h" #include "zeek/File.h"
#include "zeek/IPAddr.h" #include "zeek/IPAddr.h"
#include "zeek/Reporter.h" #include "zeek/Reporter.h"

5
src/Discard.cc
View file

@ -2,14 +2,11 @@
#include "zeek/Discard.h" #include "zeek/Discard.h"
#include "zeek/zeek-config.h"
#include <algorithm> #include <algorithm>
#include "zeek/Func.h" #include "zeek/Func.h"
#include "zeek/IP.h" #include "zeek/IP.h"
#include "zeek/Reporter.h" // for InterpreterException #include "zeek/Reporter.h" // for InterpreterException
#include "zeek/RunState.h"
#include "zeek/Val.h" #include "zeek/Val.h"
#include "zeek/Var.h" #include "zeek/Var.h"
#include "zeek/ZeekString.h" #include "zeek/ZeekString.h"
@ -25,6 +22,8 @@ Discarder::Discarder() {
discarder_maxlen = static_cast<int>(id::find_val("discarder_maxlen")->AsCount()); discarder_maxlen = static_cast<int>(id::find_val("discarder_maxlen")->AsCount());
} }
Discarder::~Discarder() {}
bool Discarder::IsActive() { return check_ip || check_tcp || check_udp || check_icmp; } bool Discarder::IsActive() { return check_ip || check_tcp || check_udp || check_icmp; }
bool Discarder::NextPacket(const std::shared_ptr<IP_Hdr>& ip, int len, int caplen) { bool Discarder::NextPacket(const std::shared_ptr<IP_Hdr>& ip, int len, int caplen) {

2
src/Discard.h
View file

@ -19,7 +19,7 @@ namespace detail {
class Discarder final { class Discarder final {
public: public:
Discarder(); Discarder();
~Discarder() = default; ~Discarder();
bool IsActive(); bool IsActive();

2
src/EquivClass.cc
View file

@ -2,8 +2,6 @@
#include "zeek/EquivClass.h" #include "zeek/EquivClass.h"
#include "zeek/zeek-config.h"
#include "zeek/CCL.h" #include "zeek/CCL.h"
#include "zeek/util.h" #include "zeek/util.h"

2
src/EventRegistry.h
View file

@ -4,8 +4,6 @@
#pragma once #pragma once
#include "zeek/zeek-config.h"
#include <map> #include <map>
#include <memory> #include <memory>
#include <string> #include <string>

3
src/Expr.cc
View file

@ -2,8 +2,6 @@
#include "zeek/Expr.h" #include "zeek/Expr.h"
#include "zeek/zeek-config.h"
#include "zeek/DebugLogger.h" #include "zeek/DebugLogger.h"
#include "zeek/Desc.h" #include "zeek/Desc.h"
#include "zeek/Event.h" #include "zeek/Event.h"
@ -22,7 +20,6 @@
#include "zeek/Trigger.h" #include "zeek/Trigger.h"
#include "zeek/Type.h" #include "zeek/Type.h"
#include "zeek/broker/Data.h" #include "zeek/broker/Data.h"
#include "zeek/digest.h"
#include "zeek/module_util.h" #include "zeek/module_util.h"
#include "zeek/script_opt/Expr.h" #include "zeek/script_opt/Expr.h"
#include "zeek/script_opt/ScriptOpt.h" #include "zeek/script_opt/ScriptOpt.h"

5
src/File.cc
View file

@ -18,18 +18,15 @@
#include <sys/resource.h> #include <sys/resource.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
#include <algorithm>
#include <cerrno> #include <cerrno>
#include "zeek/Attr.h" #include "zeek/Attr.h"
#include "zeek/Desc.h" #include "zeek/Desc.h"
#include "zeek/Event.h" #include "zeek/Event.h"
#include "zeek/Expr.h"
#include "zeek/NetVar.h"
#include "zeek/Reporter.h" #include "zeek/Reporter.h"
#include "zeek/RunState.h" #include "zeek/RunState.h"
#include "zeek/Type.h" #include "zeek/Type.h"
#include "zeek/Var.h" #include "zeek/event.bif.netvar_h"
namespace zeek { namespace zeek {

3
src/Frag.cc
View file

@ -2,9 +2,6 @@
#include "zeek/Frag.h" #include "zeek/Frag.h"
#include "zeek/zeek-config.h"
#include "zeek/Hash.h"
#include "zeek/IP.h" #include "zeek/IP.h"
#include "zeek/NetVar.h" #include "zeek/NetVar.h"
#include "zeek/Reporter.h" #include "zeek/Reporter.h"

1
src/Frame.h
View file

@ -13,7 +13,6 @@
#include "zeek/Obj.h" #include "zeek/Obj.h"
#include "zeek/Type.h" #include "zeek/Type.h"
#include "zeek/ZeekArgs.h" #include "zeek/ZeekArgs.h"
#include "zeek/ZeekList.h" // for typedef val_list
namespace zeek { namespace zeek {

1
src/Func.cc
View file

@ -16,6 +16,7 @@
#include <csignal> #include <csignal>
#include <cstdlib> #include <cstdlib>
// Most of these includes are needed for code included from bif files.
#include "zeek/Base64.h" #include "zeek/Base64.h"
#include "zeek/Debug.h" #include "zeek/Debug.h"
#include "zeek/Desc.h" #include "zeek/Desc.h"

2
src/ID.cc
View file

@ -2,8 +2,6 @@
#include "zeek/ID.h" #include "zeek/ID.h"
#include "zeek/zeek-config.h"
#include "zeek/Attr.h" #include "zeek/Attr.h"
#include "zeek/Desc.h" #include "zeek/Desc.h"
#include "zeek/Dict.h" #include "zeek/Dict.h"

1
src/IP.cc
View file

@ -10,7 +10,6 @@
#include "zeek/Reporter.h" #include "zeek/Reporter.h"
#include "zeek/Type.h" #include "zeek/Type.h"
#include "zeek/Val.h" #include "zeek/Val.h"
#include "zeek/Var.h"
#include "zeek/ZeekString.h" #include "zeek/ZeekString.h"
namespace zeek { namespace zeek {

2
src/IntSet.cc
View file

@ -2,8 +2,6 @@
#include "zeek/IntSet.h" #include "zeek/IntSet.h"
#include "zeek/zeek-config.h"
#include <cstring> #include <cstring>
namespace zeek::detail { namespace zeek::detail {

1
src/MMDB.cc
View file

@ -6,7 +6,6 @@
#include <netinet/ip.h> #include <netinet/ip.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <chrono>
#include "zeek/Func.h" #include "zeek/Func.h"
#include "zeek/IPAddr.h" #include "zeek/IPAddr.h"

2
src/NFA.cc
View file

@ -2,8 +2,6 @@
#include "zeek/NFA.h" #include "zeek/NFA.h"
#include "zeek/zeek-config.h"
#include <algorithm> #include <algorithm>
#include "zeek/Desc.h" #include "zeek/Desc.h"

3
src/NetVar.cc
View file

@ -2,8 +2,7 @@
#include "zeek/NetVar.h" #include "zeek/NetVar.h"
#include "zeek/zeek-config.h" // EventHandler.h is needed for event.bif.netvar_init later.
#include "zeek/EventHandler.h" #include "zeek/EventHandler.h"
#include "zeek/ID.h" #include "zeek/ID.h"
#include "zeek/Val.h" #include "zeek/Val.h"

2
src/NetVar.h
View file

@ -2,6 +2,8 @@
#pragma once #pragma once
// These includes are needed for the inclusion of the bif headers at the end
// of this file.
#include "zeek/EventRegistry.h" #include "zeek/EventRegistry.h"
#include "zeek/Val.h" #include "zeek/Val.h"

2
src/Notifier.cc
View file

@ -2,8 +2,6 @@
#include "zeek/Notifier.h" #include "zeek/Notifier.h"
#include <set>
#include "zeek/DebugLogger.h" #include "zeek/DebugLogger.h"
zeek::notifier::detail::Registry zeek::notifier::detail::registry; zeek::notifier::detail::Registry zeek::notifier::detail::registry;

2
src/Obj.cc
View file

@ -2,8 +2,6 @@
#include "zeek/Obj.h" #include "zeek/Obj.h"
#include "zeek/zeek-config.h"
#include <cstdlib> #include <cstdlib>
#include "zeek/Desc.h" #include "zeek/Desc.h"

2
src/Obj.h
View file

@ -2,8 +2,6 @@
#pragma once #pragma once
#include "zeek/zeek-config.h"
#include <climits> #include <climits>
namespace zeek { namespace zeek {

1
src/OpaqueVal.cc
View file

@ -19,7 +19,6 @@
#include "zeek/CompHash.h" #include "zeek/CompHash.h"
#include "zeek/Desc.h" #include "zeek/Desc.h"
#include "zeek/NetVar.h"
#include "zeek/Reporter.h" #include "zeek/Reporter.h"
#include "zeek/Scope.h" #include "zeek/Scope.h"
#include "zeek/Var.h" #include "zeek/Var.h"

2
src/PolicyFile.cc
View file

@ -2,8 +2,6 @@
#include "zeek/PolicyFile.h" #include "zeek/PolicyFile.h"
#include "zeek/zeek-config.h"
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <cassert> #include <cassert>

4
src/PriorityQueue.cc
View file

@ -2,13 +2,9 @@
#include "zeek/PriorityQueue.h" #include "zeek/PriorityQueue.h"
#include "zeek/zeek-config.h"
#include <cstdio>
#include <cstdlib> #include <cstdlib>
#include "zeek/Reporter.h" #include "zeek/Reporter.h"
#include "zeek/util.h"
namespace zeek::detail { namespace zeek::detail {

2
src/PriorityQueue.h
View file

@ -2,8 +2,6 @@
#pragma once #pragma once
#include "zeek/zeek-config.h"
#include <cmath> #include <cmath>
#include <cstdint> #include <cstdint>

2
src/RE.cc
View file

@ -2,8 +2,6 @@
#include "zeek/RE.h" #include "zeek/RE.h"
#include "zeek/zeek-config.h"
#include <cstdlib> #include <cstdlib>
#include <utility> #include <utility>

2
src/RandTest.h
View file

@ -2,8 +2,6 @@
#pragma once #pragma once
#include "zeek/zeek-config.h"
#include <cstdint> #include <cstdint>
#define RT_MONTEN \ #define RT_MONTEN \

2
src/Reassem.cc
View file

@ -2,8 +2,6 @@
#include "zeek/Reassem.h" #include "zeek/Reassem.h"
#include "zeek/zeek-config.h"
#include <algorithm> #include <algorithm>
#include <cinttypes> #include <cinttypes>
#include <limits> #include <limits>

3
src/Reporter.cc
View file

@ -4,8 +4,6 @@
#include "zeek/Reporter.h" #include "zeek/Reporter.h"
#include "zeek/zeek-config.h"
#include <syslog.h> #include <syslog.h>
#include <unistd.h> #include <unistd.h>
@ -16,7 +14,6 @@
#include "zeek/Expr.h" #include "zeek/Expr.h"
#include "zeek/Frame.h" #include "zeek/Frame.h"
#include "zeek/ID.h" #include "zeek/ID.h"
#include "zeek/NetVar.h"
#include "zeek/RunState.h" #include "zeek/RunState.h"
#include "zeek/Timer.h" #include "zeek/Timer.h"
#include "zeek/file_analysis/File.h" #include "zeek/file_analysis/File.h"

2
src/Rule.cc
View file

@ -2,8 +2,6 @@
#include "zeek/Rule.h" #include "zeek/Rule.h"
#include "zeek/zeek-config.h"
#include "zeek/RuleAction.h" #include "zeek/RuleAction.h"
#include "zeek/RuleCondition.h" #include "zeek/RuleCondition.h"
#include "zeek/RuleMatcher.h" #include "zeek/RuleMatcher.h"

3
src/RuleAction.cc
View file

@ -2,8 +2,6 @@
#include "zeek/RuleAction.h" #include "zeek/RuleAction.h"
#include "zeek/zeek-config.h"
#include <algorithm> #include <algorithm>
#include <string> #include <string>
@ -12,7 +10,6 @@
#include "zeek/Event.h" #include "zeek/Event.h"
#include "zeek/Func.h" #include "zeek/Func.h"
#include "zeek/ID.h" #include "zeek/ID.h"
#include "zeek/NetVar.h"
#include "zeek/RuleMatcher.h" #include "zeek/RuleMatcher.h"
#include "zeek/Type.h" #include "zeek/Type.h"
#include "zeek/analyzer/Manager.h" #include "zeek/analyzer/Manager.h"

2
src/RuleCondition.cc
View file

@ -2,8 +2,6 @@
#include "zeek/RuleCondition.h" #include "zeek/RuleCondition.h"
#include "zeek/zeek-config.h"
#include "zeek/Func.h" #include "zeek/Func.h"
#include "zeek/ID.h" #include "zeek/ID.h"
#include "zeek/Reporter.h" #include "zeek/Reporter.h"

2
src/RuleCondition.h
View file

@ -5,8 +5,6 @@
#include <sys/types.h> // for u_char #include <sys/types.h> // for u_char
#include <cstdint> // for u_char #include <cstdint> // for u_char
#include "zeek/util.h"
namespace zeek::detail { namespace zeek::detail {
class RuleEndpointState; class RuleEndpointState;

1
src/RuleMatcher.h
View file

@ -3,7 +3,6 @@
#pragma once #pragma once
#include <sys/types.h> // for u_char #include <sys/types.h> // for u_char
#include <climits>
#include <functional> #include <functional>
#include <map> #include <map>
#include <set> #include <set>

2
src/RunState.h
View file

@ -2,8 +2,6 @@
#pragma once #pragma once
#include "zeek/zeek-config.h"
#include <optional> #include <optional>
#include <string> #include <string>

1
src/ScannedFile.cc
View file

@ -3,7 +3,6 @@
#include "zeek/ScannedFile.h" #include "zeek/ScannedFile.h"
#include <cerrno> #include <cerrno>
#include <climits> // for PATH_MAX
#include "zeek/DebugLogger.h" #include "zeek/DebugLogger.h"
#include "zeek/Reporter.h" #include "zeek/Reporter.h"

3
src/ScannedFile.h
View file

@ -2,12 +2,13 @@
#pragma once #pragma once
#include <zeek/Obj.h>
#include <list> #include <list>
#include <optional> #include <optional>
#include <string> #include <string>
#include <vector> #include <vector>
#include "zeek/Obj.h"
namespace zeek::detail { namespace zeek::detail {
// Script file we have already scanned (or are in the process of scanning). // Script file we have already scanned (or are in the process of scanning).

4
src/Scope.cc
View file

@ -2,13 +2,11 @@
#include "zeek/Scope.h" #include "zeek/Scope.h"
#include "zeek/zeek-config.h"
#include "zeek/Desc.h" #include "zeek/Desc.h"
#include "zeek/ID.h" #include "zeek/ID.h"
#include "zeek/IntrusivePtr.h" #include "zeek/IntrusivePtr.h"
#include "zeek/Reporter.h" #include "zeek/Reporter.h"
#include "zeek/Val.h" #include "zeek/Type.h"
#include "zeek/module_util.h" #include "zeek/module_util.h"
namespace zeek::detail { namespace zeek::detail {

1
src/ScriptCoverageManager.h
View file

@ -9,7 +9,6 @@
#include "zeek/ID.h" #include "zeek/ID.h"
#include "zeek/StmtBase.h" #include "zeek/StmtBase.h"
#include "zeek/util.h"
namespace zeek::detail { namespace zeek::detail {

2
src/ScriptProfile.cc
View file

@ -2,6 +2,8 @@
#include "zeek/ScriptProfile.h" #include "zeek/ScriptProfile.h"
#include <cinttypes>
namespace zeek { namespace zeek {
namespace detail { namespace detail {

1
src/ScriptProfile.h
View file

@ -7,7 +7,6 @@
#include <string> #include <string>
#include "zeek/Func.h" #include "zeek/Func.h"
#include "zeek/Stmt.h"
namespace zeek { namespace zeek {

2
src/ScriptValidation.cc
View file

@ -3,8 +3,6 @@
#include "zeek/ScriptValidation.h" #include "zeek/ScriptValidation.h"
#include "zeek/Func.h" #include "zeek/Func.h"
#include "zeek/Reporter.h"
#include "zeek/Stmt.h"
#include "zeek/Traverse.h" #include "zeek/Traverse.h"
namespace zeek::detail { namespace zeek::detail {

2
src/SerializationFormat.h
View file

@ -4,8 +4,6 @@
#pragma once #pragma once
#include "zeek/zeek-config.h"
#include <cstdint> #include <cstdint>
#include <string> #include <string>

2
src/SmithWaterman.cc
View file

@ -2,8 +2,6 @@
#include "zeek/SmithWaterman.h" #include "zeek/SmithWaterman.h"
#include "zeek/zeek-config.h"
#include <algorithm> #include <algorithm>
#include <cctype> #include <cctype>

1
src/SmithWaterman.h
View file

@ -3,6 +3,7 @@
#pragma once #pragma once
#include <map> #include <map>
#include <string>
#include <vector> #include <vector>
#include "zeek/ZeekString.h" #include "zeek/ZeekString.h"

2
src/Stats.h
View file

@ -4,8 +4,6 @@
#pragma once #pragma once
#include "zeek/zeek-config.h"
#include <cstdint> #include <cstdint>
#include <memory> #include <memory>

3
src/Stmt.cc
View file

@ -2,8 +2,6 @@
#include "zeek/Stmt.h" #include "zeek/Stmt.h"
#include "zeek/zeek-config.h"
#include "zeek/CompHash.h" #include "zeek/CompHash.h"
#include "zeek/Debug.h" #include "zeek/Debug.h"
#include "zeek/Desc.h" #include "zeek/Desc.h"
@ -13,7 +11,6 @@
#include "zeek/File.h" #include "zeek/File.h"
#include "zeek/Frame.h" #include "zeek/Frame.h"
#include "zeek/IntrusivePtr.h" #include "zeek/IntrusivePtr.h"
#include "zeek/NetVar.h"
#include "zeek/Reporter.h" #include "zeek/Reporter.h"
#include "zeek/Scope.h" #include "zeek/Scope.h"
#include "zeek/Traverse.h" #include "zeek/Traverse.h"

3
src/Tag.h
View file

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

2
src/Timer.cc
View file

@ -2,8 +2,6 @@
#include "zeek/Timer.h" #include "zeek/Timer.h"
#include "zeek/zeek-config.h"
#include "zeek/Desc.h" #include "zeek/Desc.h"
#include "zeek/NetVar.h" #include "zeek/NetVar.h"
#include "zeek/RunState.h" #include "zeek/RunState.h"

2
src/TraverseTypes.h
View file

@ -2,8 +2,6 @@
#pragma once #pragma once
#include "zeek/zeek-config.h"
namespace zeek::detail { namespace zeek::detail {
class TraversalCallback; class TraversalCallback;

1
src/TunnelEncapsulation.h
View file

@ -4,7 +4,6 @@
#include <vector> #include <vector>
#include "zeek/ID.h"
#include "zeek/IP.h" #include "zeek/IP.h"
#include "zeek/IPAddr.h" #include "zeek/IPAddr.h"
#include "zeek/NetVar.h" #include "zeek/NetVar.h"

3
src/Type.cc
View file

@ -2,10 +2,7 @@
#include "zeek/Type.h" #include "zeek/Type.h"
#include "zeek/zeek-config.h"
#include <cinttypes> #include <cinttypes>
#include <list>
#include <map> #include <map>
#include <string> #include <string>
#include <unordered_set> #include <unordered_set>

2
src/UID.cc
View file

@ -7,8 +7,6 @@
#include "zeek/Reporter.h" #include "zeek/Reporter.h"
#include "zeek/util.h" #include "zeek/util.h"
using namespace std;
namespace zeek { namespace zeek {
void UID::Set(zeek_uint_t bits, const uint64_t* v, size_t n) { void UID::Set(zeek_uint_t bits, const uint64_t* v, size_t n) {

3
src/Var.cc
View file

@ -2,8 +2,6 @@
#include "zeek/Var.h" #include "zeek/Var.h"
#include "zeek/zeek-config.h"
#include <memory> #include <memory>
#include "zeek/Desc.h" #include "zeek/Desc.h"
@ -18,7 +16,6 @@
#include "zeek/Stmt.h" #include "zeek/Stmt.h"
#include "zeek/Traverse.h" #include "zeek/Traverse.h"
#include "zeek/Val.h" #include "zeek/Val.h"
#include "zeek/module_util.h"
#include "zeek/script_opt/IDOptInfo.h" #include "zeek/script_opt/IDOptInfo.h"
#include "zeek/script_opt/ScriptOpt.h" #include "zeek/script_opt/ScriptOpt.h"
#include "zeek/script_opt/StmtOptInfo.h" #include "zeek/script_opt/StmtOptInfo.h"

1
src/WeirdState.cc
View file

@ -3,7 +3,6 @@
#include "zeek/WeirdState.h" #include "zeek/WeirdState.h"
#include "zeek/RunState.h" #include "zeek/RunState.h"
#include "zeek/util.h"
namespace zeek::detail { namespace zeek::detail {

1
src/ZVal.cc
View file

@ -4,7 +4,6 @@
#include "zeek/Func.h" #include "zeek/Func.h"
#include "zeek/OpaqueVal.h" #include "zeek/OpaqueVal.h"
#include "zeek/Reporter.h" #include "zeek/Reporter.h"
#include "zeek/ZeekString.h"
using namespace zeek; using namespace zeek;

4
src/ZVal.h
View file

@ -4,7 +4,7 @@
#pragma once #pragma once
#include "zeek/zeek-config.h" #include "zeek/IntrusivePtr.h"
namespace zeek { namespace zeek {
@ -19,6 +19,7 @@ class RecordVal;
class StringVal; class StringVal;
class SubNetVal; class SubNetVal;
class TableVal; class TableVal;
class Type;
class TypeVal; class TypeVal;
class Val; class Val;
class VectorVal; class VectorVal;
@ -32,6 +33,7 @@ using RecordValPtr = IntrusivePtr<RecordVal>;
using StringValPtr = IntrusivePtr<StringVal>; using StringValPtr = IntrusivePtr<StringVal>;
using SubNetValPtr = IntrusivePtr<SubNetVal>; using SubNetValPtr = IntrusivePtr<SubNetVal>;
using TableValPtr = IntrusivePtr<TableVal>; using TableValPtr = IntrusivePtr<TableVal>;
using TypePtr = IntrusivePtr<Type>;
using TypeValPtr = IntrusivePtr<TypeVal>; using TypeValPtr = IntrusivePtr<TypeVal>;
using ValPtr = IntrusivePtr<Val>; using ValPtr = IntrusivePtr<Val>;
using VectorValPtr = IntrusivePtr<VectorVal>; using VectorValPtr = IntrusivePtr<VectorVal>;

2
src/ZeekString.cc
View file

@ -2,8 +2,6 @@
#include "zeek/ZeekString.h" #include "zeek/ZeekString.h"
#include "zeek/zeek-config.h"
#include <algorithm> #include <algorithm>
#include <cctype> #include <cctype>
#include <iostream> #include <iostream>

4
src/ZeekString.h
View file

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

4
src/analyzer/Analyzer.cc
View file

@ -5,10 +5,10 @@
#include <binpac.h> #include <binpac.h>
#include <algorithm> #include <algorithm>
#include "zeek/Conn.h"
#include "zeek/Event.h" #include "zeek/Event.h"
#include "zeek/ZeekString.h"
#include "zeek/analyzer/Manager.h" #include "zeek/analyzer/Manager.h"
#include "zeek/analyzer/protocol/pia/PIA.h" #include "zeek/packet_analysis/protocol/tcp/TCPSessionAdapter.h"
#include "zeek/3rdparty/doctest.h" #include "zeek/3rdparty/doctest.h"

1
src/analyzer/Analyzer.h
View file

@ -10,7 +10,6 @@
#include "zeek/EventHandler.h" #include "zeek/EventHandler.h"
#include "zeek/IntrusivePtr.h" #include "zeek/IntrusivePtr.h"
#include "zeek/Obj.h"
#include "zeek/Tag.h" #include "zeek/Tag.h"
#include "zeek/Timer.h" #include "zeek/Timer.h"

2
src/analyzer/Component.h
View file

@ -2,8 +2,6 @@
#pragma once #pragma once
#include "zeek/zeek-config.h"
#include "zeek/Tag.h" #include "zeek/Tag.h"
#include "zeek/plugin/Component.h" #include "zeek/plugin/Component.h"
#include "zeek/util.h" #include "zeek/util.h"

7
src/analyzer/Manager.cc
View file

@ -2,17 +2,12 @@
#include "zeek/analyzer/Manager.h" #include "zeek/analyzer/Manager.h"
#include "zeek/Hash.h" #include "zeek/Conn.h"
#include "zeek/IntrusivePtr.h" #include "zeek/IntrusivePtr.h"
#include "zeek/RunState.h" #include "zeek/RunState.h"
#include "zeek/Val.h" #include "zeek/Val.h"
#include "zeek/analyzer/protocol/conn-size/ConnSize.h"
#include "zeek/analyzer/protocol/pia/PIA.h"
#include "zeek/analyzer/protocol/tcp/TCP.h"
#include "zeek/analyzer/protocol/tcp/events.bif.h"
#include "zeek/packet_analysis/protocol/ip/IPBasedAnalyzer.h" #include "zeek/packet_analysis/protocol/ip/IPBasedAnalyzer.h"
#include "zeek/packet_analysis/protocol/ip/SessionAdapter.h" #include "zeek/packet_analysis/protocol/ip/SessionAdapter.h"
#include "zeek/plugin/Manager.h"
namespace zeek::analyzer { namespace zeek::analyzer {

2
src/analyzer/Manager.h
View file

@ -24,10 +24,10 @@
#include <vector> #include <vector>
#include "zeek/IP.h" #include "zeek/IP.h"
#include "zeek/IPAddr.h"
#include "zeek/Tag.h" #include "zeek/Tag.h"
#include "zeek/analyzer/Analyzer.h" #include "zeek/analyzer/Analyzer.h"
#include "zeek/analyzer/Component.h" #include "zeek/analyzer/Component.h"
#include "zeek/analyzer/analyzer.bif.h"
#include "zeek/net_util.h" #include "zeek/net_util.h"
#include "zeek/plugin/ComponentManager.h" #include "zeek/plugin/ComponentManager.h"

1
src/analyzer/protocol/conn-size/ConnSize.cc
View file

@ -8,7 +8,6 @@
#include "zeek/Reporter.h" #include "zeek/Reporter.h"
#include "zeek/RunState.h" #include "zeek/RunState.h"
#include "zeek/analyzer/protocol/conn-size/events.bif.h" #include "zeek/analyzer/protocol/conn-size/events.bif.h"
#include "zeek/analyzer/protocol/tcp/TCP.h"
namespace zeek::analyzer::conn_size { namespace zeek::analyzer::conn_size {

1
src/analyzer/protocol/conn-size/ConnSize.h
View file

@ -2,7 +2,6 @@
#pragma once #pragma once
#include "zeek/NetVar.h"
#include "zeek/analyzer/Analyzer.h" #include "zeek/analyzer/Analyzer.h"
namespace zeek::analyzer::conn_size { namespace zeek::analyzer::conn_size {

4
src/analyzer/protocol/dce-rpc/DCE_RPC.cc
View file

@ -2,11 +2,7 @@
#include "zeek/analyzer/protocol/dce-rpc/DCE_RPC.h" #include "zeek/analyzer/protocol/dce-rpc/DCE_RPC.h"
#include "zeek/zeek-config.h"
#include <cstdlib> #include <cstdlib>
#include <map>
#include <string>
using namespace std; using namespace std;

4
src/analyzer/protocol/dce-rpc/DCE_RPC.h
View file

@ -2,10 +2,8 @@
#pragma once #pragma once
#include "zeek/IPAddr.h" #include "zeek/Conn.h"
#include "zeek/NetVar.h"
#include "zeek/analyzer/protocol/dce-rpc/dce_rpc_pac.h" #include "zeek/analyzer/protocol/dce-rpc/dce_rpc_pac.h"
#include "zeek/analyzer/protocol/dce-rpc/events.bif.h"
#include "zeek/analyzer/protocol/tcp/TCP.h" #include "zeek/analyzer/protocol/tcp/TCP.h"
namespace zeek::analyzer::dce_rpc { namespace zeek::analyzer::dce_rpc {

3
src/analyzer/protocol/dhcp/DHCP.cc
View file

@ -2,9 +2,6 @@
#include "zeek/analyzer/protocol/dhcp/DHCP.h" #include "zeek/analyzer/protocol/dhcp/DHCP.h"
#include "zeek/analyzer/protocol/dhcp/events.bif.h"
#include "zeek/analyzer/protocol/dhcp/types.bif.h"
namespace zeek::analyzer::dhcp { namespace zeek::analyzer::dhcp {
DHCP_Analyzer::DHCP_Analyzer(Connection* conn) : Analyzer("DHCP", conn) { interp = new binpac::DHCP::DHCP_Conn(this); } DHCP_Analyzer::DHCP_Analyzer(Connection* conn) : Analyzer("DHCP", conn) { interp = new binpac::DHCP::DHCP_Conn(this); }

1
src/analyzer/protocol/dnp3/DNP3.cc
View file

@ -106,7 +106,6 @@
#include "zeek/analyzer/protocol/dnp3/DNP3.h" #include "zeek/analyzer/protocol/dnp3/DNP3.h"
#include "zeek/Reporter.h" #include "zeek/Reporter.h"
#include "zeek/analyzer/protocol/dnp3/events.bif.h"
constexpr unsigned int PSEUDO_LENGTH_INDEX = 2; // index of len field of DNP3 Pseudo Link Layer constexpr unsigned int PSEUDO_LENGTH_INDEX = 2; // index of len field of DNP3 Pseudo Link Layer
constexpr unsigned int PSEUDO_CONTROL_FIELD_INDEX = 3; // index of ctrl field of DNP3 Pseudo Link Layer constexpr unsigned int PSEUDO_CONTROL_FIELD_INDEX = 3; // index of ctrl field of DNP3 Pseudo Link Layer

8
src/analyzer/protocol/dns/DNS.cc
View file

@ -2,8 +2,6 @@
#include "zeek/analyzer/protocol/dns/DNS.h" #include "zeek/analyzer/protocol/dns/DNS.h"
#include "zeek/zeek-config.h"
#include <arpa/inet.h> #include <arpa/inet.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <sys/socket.h> #include <sys/socket.h>
@ -792,7 +790,7 @@ bool DNS_Interpreter::ParseRR_EDNS(detail::DNS_MsgInfo* msg, const u_char*& data
void DNS_Interpreter::ExtractOctets(const u_char*& data, int& len, String** p) { void DNS_Interpreter::ExtractOctets(const u_char*& data, int& len, String** p) {
uint16_t dlen = ExtractShort(data, len); uint16_t dlen = ExtractShort(data, len);
dlen = min(len, static_cast<int>(dlen)); dlen = std::min(len, static_cast<int>(dlen));
if ( p ) if ( p )
*p = new String(data, dlen, false); *p = new String(data, dlen, false);
@ -802,8 +800,8 @@ void DNS_Interpreter::ExtractOctets(const u_char*& data, int& len, String** p) {
} }
String* DNS_Interpreter::ExtractStream(const u_char*& data, int& len, int l) { String* DNS_Interpreter::ExtractStream(const u_char*& data, int& len, int l) {
l = max(l, 0); l = std::max(l, 0);
int dlen = min(len, l); // Len in bytes of the algorithm use int dlen = std::min(len, l); // Len in bytes of the algorithm use
auto rval = new String(data, dlen, false); auto rval = new String(data, dlen, false);
data += dlen; data += dlen;

1
src/analyzer/protocol/dns/DNS.h
View file

@ -3,7 +3,6 @@
#pragma once #pragma once
#include "zeek/analyzer/protocol/tcp/TCP.h" #include "zeek/analyzer/protocol/tcp/TCP.h"
#include "zeek/binpac_zeek.h"
namespace zeek::analyzer::dns { namespace zeek::analyzer::dns {
namespace detail { namespace detail {

1
src/analyzer/protocol/file/File.cc
View file

@ -8,7 +8,6 @@
#include "zeek/RuleMatcher.h" #include "zeek/RuleMatcher.h"
#include "zeek/analyzer/protocol/file/events.bif.h" #include "zeek/analyzer/protocol/file/events.bif.h"
#include "zeek/file_analysis/Manager.h" #include "zeek/file_analysis/Manager.h"
#include "zeek/util.h"
namespace zeek::analyzer::file { namespace zeek::analyzer::file {

4
src/analyzer/protocol/finger/legacy/Finger.cc
View file

@ -2,12 +2,8 @@
#include "zeek/analyzer/protocol/finger/legacy/Finger.h" #include "zeek/analyzer/protocol/finger/legacy/Finger.h"
#include "zeek/zeek-config.h"
#include <cctype> #include <cctype>
#include "zeek/Event.h"
#include "zeek/NetVar.h"
#include "zeek/analyzer/protocol/finger/legacy/events.bif.h" #include "zeek/analyzer/protocol/finger/legacy/events.bif.h"
#include "zeek/analyzer/protocol/tcp/ContentLine.h" #include "zeek/analyzer/protocol/tcp/ContentLine.h"

4
src/analyzer/protocol/ftp/FTP.cc
View file

@ -2,13 +2,9 @@
#include "zeek/analyzer/protocol/ftp/FTP.h" #include "zeek/analyzer/protocol/ftp/FTP.h"
#include "zeek/zeek-config.h"
#include <cstdlib> #include <cstdlib>
#include "zeek/Base64.h" #include "zeek/Base64.h"
#include "zeek/Event.h"
#include "zeek/NetVar.h"
#include "zeek/RuleMatcher.h" #include "zeek/RuleMatcher.h"
#include "zeek/ZeekString.h" #include "zeek/ZeekString.h"
#include "zeek/analyzer/Manager.h" #include "zeek/analyzer/Manager.h"

4
src/analyzer/protocol/gnutella/Gnutella.cc
View file

@ -2,13 +2,9 @@
#include "zeek/analyzer/protocol/gnutella/Gnutella.h" #include "zeek/analyzer/protocol/gnutella/Gnutella.h"
#include "zeek/zeek-config.h"
#include <algorithm> #include <algorithm>
#include <cctype> #include <cctype>
#include "zeek/Event.h"
#include "zeek/NetVar.h"
#include "zeek/analyzer/Manager.h" #include "zeek/analyzer/Manager.h"
#include "zeek/analyzer/protocol/gnutella/events.bif.h" #include "zeek/analyzer/protocol/gnutella/events.bif.h"
#include "zeek/analyzer/protocol/pia/PIA.h" #include "zeek/analyzer/protocol/pia/PIA.h"

1
src/analyzer/protocol/gssapi/GSSAPI.cc
View file

@ -3,7 +3,6 @@
#include "zeek/analyzer/protocol/gssapi/GSSAPI.h" #include "zeek/analyzer/protocol/gssapi/GSSAPI.h"
#include "zeek/Reporter.h" #include "zeek/Reporter.h"
#include "zeek/analyzer/protocol/gssapi/events.bif.h"
#include "zeek/analyzer/protocol/tcp/TCP_Reassembler.h" #include "zeek/analyzer/protocol/tcp/TCP_Reassembler.h"
namespace zeek::analyzer::gssapi { namespace zeek::analyzer::gssapi {

1
src/analyzer/protocol/gssapi/GSSAPI.h
View file

@ -2,7 +2,6 @@
#pragma once #pragma once
#include "zeek/analyzer/protocol/gssapi/events.bif.h"
#include "zeek/analyzer/protocol/gssapi/gssapi_pac.h" #include "zeek/analyzer/protocol/gssapi/gssapi_pac.h"
#include "zeek/analyzer/protocol/tcp/TCP.h" #include "zeek/analyzer/protocol/tcp/TCP.h"

4
src/analyzer/protocol/ident/Ident.cc
View file

@ -2,12 +2,8 @@
#include "zeek/analyzer/protocol/ident/Ident.h" #include "zeek/analyzer/protocol/ident/Ident.h"
#include "zeek/zeek-config.h"
#include <cctype> #include <cctype>
#include "zeek/Event.h"
#include "zeek/NetVar.h"
#include "zeek/ZeekString.h" #include "zeek/ZeekString.h"
#include "zeek/analyzer/protocol/ident/events.bif.h" #include "zeek/analyzer/protocol/ident/events.bif.h"

3
src/analyzer/protocol/imap/IMAP.h
View file

@ -2,9 +2,6 @@
#pragma once #pragma once
// for std::transform
#include <algorithm>
#include "zeek/analyzer/protocol/tcp/TCP.h" #include "zeek/analyzer/protocol/tcp/TCP.h"
#include "analyzer/protocol/imap/imap_pac.h" #include "analyzer/protocol/imap/imap_pac.h"

3
src/analyzer/protocol/irc/IRC.cc
View file

@ -4,11 +4,8 @@
#include "zeek/analyzer/protocol/irc/IRC.h" #include "zeek/analyzer/protocol/irc/IRC.h"
#include <iostream>
#include <unordered_set> #include <unordered_set>
#include "zeek/Event.h"
#include "zeek/NetVar.h"
#include "zeek/analyzer/Manager.h" #include "zeek/analyzer/Manager.h"
#include "zeek/analyzer/protocol/irc/events.bif.h" #include "zeek/analyzer/protocol/irc/events.bif.h"
#include "zeek/analyzer/protocol/zip/ZIP.h" #include "zeek/analyzer/protocol/zip/ZIP.h"

3
src/analyzer/protocol/krb/KRB.cc
View file

@ -4,9 +4,6 @@
#include <unistd.h> #include <unistd.h>
#include "zeek/analyzer/protocol/krb/events.bif.h"
#include "zeek/analyzer/protocol/krb/types.bif.h"
namespace zeek::analyzer::krb { namespace zeek::analyzer::krb {
bool KRB_Analyzer::krb_available = false; bool KRB_Analyzer::krb_available = false;

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