From 456c1fa42cf58355634da8b990d5f49c49e323bb Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Tue, 8 Apr 2025 14:57:34 -0700 Subject: [PATCH] Remove unnecessary #includes in analyzer/packet analyzer/file analyzer headers --- src/Discard.cc | 2 ++ src/Discard.h | 2 +- src/analyzer/Analyzer.h | 1 - src/analyzer/Component.h | 2 -- src/analyzer/Manager.h | 2 +- src/analyzer/protocol/conn-size/ConnSize.h | 1 - src/analyzer/protocol/dce-rpc/DCE_RPC.h | 4 +--- src/analyzer/protocol/dns/DNS.cc | 6 +++--- src/analyzer/protocol/dns/DNS.h | 1 - src/analyzer/protocol/gssapi/GSSAPI.h | 1 - src/analyzer/protocol/imap/IMAP.h | 3 --- src/analyzer/protocol/krb/KRB.h | 6 +++--- src/analyzer/protocol/mime/MIME.h | 1 - src/analyzer/protocol/mqtt/MQTT.h | 1 - src/analyzer/protocol/mysql/MySQL.h | 1 - src/analyzer/protocol/ncp/NCP.h | 1 - src/analyzer/protocol/ntlm/NTLM.h | 1 - src/analyzer/protocol/ntp/NTP.h | 2 -- src/analyzer/protocol/radius/RADIUS.h | 1 - src/analyzer/protocol/rdp/RDP.h | 1 - src/analyzer/protocol/rdp/RDPEUDP.h | 1 - src/analyzer/protocol/rfb/RFB.h | 1 - src/analyzer/protocol/rpc/NFS.h | 1 - src/analyzer/protocol/rpc/RPC.h | 1 - src/analyzer/protocol/rpc/XDR.h | 2 -- src/analyzer/protocol/sip/SIP.h | 1 - src/analyzer/protocol/snmp/SNMP.h | 3 ++- src/analyzer/protocol/snmp/snmp.pac | 1 - src/analyzer/protocol/ssh/SSH.h | 1 - src/analyzer/protocol/ssl/DTLS.h | 2 +- src/analyzer/protocol/ssl/SSL.h | 1 - src/analyzer/protocol/syslog/legacy/Syslog.h | 2 +- src/analyzer/protocol/tcp/TCP.h | 2 -- src/analyzer/protocol/zip/ZIP.h | 2 -- src/file_analysis/Component.h | 2 -- src/file_analysis/File.cc | 4 ++-- src/file_analysis/File.h | 2 -- src/file_analysis/FileReassembler.h | 1 - src/file_analysis/analyzer/data_event/DataEvent.h | 2 -- src/file_analysis/analyzer/entropy/Entropy.cc | 1 + src/file_analysis/analyzer/entropy/Entropy.h | 3 --- src/file_analysis/analyzer/extract/Extract.cc | 2 +- src/file_analysis/analyzer/extract/Extract.h | 1 - src/file_analysis/analyzer/hash/Hash.h | 2 -- src/file_analysis/analyzer/pe/PE.h | 3 --- src/packet_analysis/Component.h | 2 -- src/packet_analysis/Dispatcher.h | 1 - src/packet_analysis/Manager.h | 1 - src/packet_analysis/protocol/ayiya/AYIYA.h | 2 +- src/packet_analysis/protocol/fddi/FDDI.h | 2 +- src/packet_analysis/protocol/geneve/Geneve.h | 3 ++- src/packet_analysis/protocol/gre/GRE.h | 2 +- src/packet_analysis/protocol/icmp/ICMPSessionAdapter.cc | 1 + src/packet_analysis/protocol/ieee802_11/IEEE802_11.h | 2 +- .../protocol/ieee802_11_radio/IEEE802_11_Radio.h | 2 +- src/packet_analysis/protocol/ip/IP.cc | 1 - src/packet_analysis/protocol/ip/IPBasedAnalyzer.h | 1 - src/packet_analysis/protocol/linux_sll2/LinuxSLL2.h | 4 +++- src/packet_analysis/protocol/llc/LLC.h | 2 +- src/packet_analysis/protocol/mpls/MPLS.h | 2 +- src/packet_analysis/protocol/nflog/NFLog.h | 2 +- src/packet_analysis/protocol/novell_802_3/Novell_802_3.h | 2 +- src/packet_analysis/protocol/ppp/PPP.h | 2 +- src/packet_analysis/protocol/ppp_serial/PPPSerial.h | 2 +- src/packet_analysis/protocol/pppoe/PPPoE.h | 2 +- src/packet_analysis/protocol/tcp/TCP.h | 1 - src/packet_analysis/protocol/tcp/TCPSessionAdapter.h | 2 -- src/packet_analysis/protocol/teredo/Teredo.h | 1 - src/packet_analysis/protocol/vntag/VNTag.h | 2 +- src/packet_analysis/protocol/vxlan/VXLAN.h | 2 +- src/spicy/manager.cc | 1 + testing/btest/plugins/protocol-plugin/src/Foo.cc | 1 + 72 files changed, 41 insertions(+), 91 deletions(-) diff --git a/src/Discard.cc b/src/Discard.cc index 9c5ec0272f..8ad64a880e 100644 --- a/src/Discard.cc +++ b/src/Discard.cc @@ -22,6 +22,8 @@ Discarder::Discarder() { discarder_maxlen = static_cast(id::find_val("discarder_maxlen")->AsCount()); } +Discarder::~Discarder() {} + bool Discarder::IsActive() { return check_ip || check_tcp || check_udp || check_icmp; } bool Discarder::NextPacket(const std::shared_ptr& ip, int len, int caplen) { diff --git a/src/Discard.h b/src/Discard.h index 9049516329..7adb6ea21c 100644 --- a/src/Discard.h +++ b/src/Discard.h @@ -19,7 +19,7 @@ namespace detail { class Discarder final { public: Discarder(); - ~Discarder() = default; + ~Discarder(); bool IsActive(); diff --git a/src/analyzer/Analyzer.h b/src/analyzer/Analyzer.h index 78b7bfadfa..ee35a457e6 100644 --- a/src/analyzer/Analyzer.h +++ b/src/analyzer/Analyzer.h @@ -10,7 +10,6 @@ #include "zeek/EventHandler.h" #include "zeek/IntrusivePtr.h" -#include "zeek/Obj.h" #include "zeek/Tag.h" #include "zeek/Timer.h" diff --git a/src/analyzer/Component.h b/src/analyzer/Component.h index 324cc6e5bb..9f5e645e1b 100644 --- a/src/analyzer/Component.h +++ b/src/analyzer/Component.h @@ -2,8 +2,6 @@ #pragma once -#include "zeek/zeek-config.h" - #include "zeek/Tag.h" #include "zeek/plugin/Component.h" #include "zeek/util.h" diff --git a/src/analyzer/Manager.h b/src/analyzer/Manager.h index 6657b5f2d9..f358e4adcf 100644 --- a/src/analyzer/Manager.h +++ b/src/analyzer/Manager.h @@ -24,10 +24,10 @@ #include #include "zeek/IP.h" +#include "zeek/IPAddr.h" #include "zeek/Tag.h" #include "zeek/analyzer/Analyzer.h" #include "zeek/analyzer/Component.h" -#include "zeek/analyzer/analyzer.bif.h" #include "zeek/net_util.h" #include "zeek/plugin/ComponentManager.h" diff --git a/src/analyzer/protocol/conn-size/ConnSize.h b/src/analyzer/protocol/conn-size/ConnSize.h index 3e2c62be25..2ba0aacfbe 100644 --- a/src/analyzer/protocol/conn-size/ConnSize.h +++ b/src/analyzer/protocol/conn-size/ConnSize.h @@ -2,7 +2,6 @@ #pragma once -#include "zeek/NetVar.h" #include "zeek/analyzer/Analyzer.h" namespace zeek::analyzer::conn_size { diff --git a/src/analyzer/protocol/dce-rpc/DCE_RPC.h b/src/analyzer/protocol/dce-rpc/DCE_RPC.h index 7ddafd7716..a4ef01869f 100644 --- a/src/analyzer/protocol/dce-rpc/DCE_RPC.h +++ b/src/analyzer/protocol/dce-rpc/DCE_RPC.h @@ -2,10 +2,8 @@ #pragma once -#include "zeek/IPAddr.h" -#include "zeek/NetVar.h" +#include "zeek/Conn.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" namespace zeek::analyzer::dce_rpc { diff --git a/src/analyzer/protocol/dns/DNS.cc b/src/analyzer/protocol/dns/DNS.cc index 12b30f22b5..4930c2dcfd 100644 --- a/src/analyzer/protocol/dns/DNS.cc +++ b/src/analyzer/protocol/dns/DNS.cc @@ -792,7 +792,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) { uint16_t dlen = ExtractShort(data, len); - dlen = min(len, static_cast(dlen)); + dlen = std::min(len, static_cast(dlen)); if ( p ) *p = new String(data, dlen, false); @@ -802,8 +802,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) { - l = max(l, 0); - int dlen = min(len, l); // Len in bytes of the algorithm use + l = std::max(l, 0); + int dlen = std::min(len, l); // Len in bytes of the algorithm use auto rval = new String(data, dlen, false); data += dlen; diff --git a/src/analyzer/protocol/dns/DNS.h b/src/analyzer/protocol/dns/DNS.h index 0894b3bad8..7c6fe57f36 100644 --- a/src/analyzer/protocol/dns/DNS.h +++ b/src/analyzer/protocol/dns/DNS.h @@ -3,7 +3,6 @@ #pragma once #include "zeek/analyzer/protocol/tcp/TCP.h" -#include "zeek/binpac_zeek.h" namespace zeek::analyzer::dns { namespace detail { diff --git a/src/analyzer/protocol/gssapi/GSSAPI.h b/src/analyzer/protocol/gssapi/GSSAPI.h index 7c56439717..68d8f43a0b 100644 --- a/src/analyzer/protocol/gssapi/GSSAPI.h +++ b/src/analyzer/protocol/gssapi/GSSAPI.h @@ -2,7 +2,6 @@ #pragma once -#include "zeek/analyzer/protocol/gssapi/events.bif.h" #include "zeek/analyzer/protocol/gssapi/gssapi_pac.h" #include "zeek/analyzer/protocol/tcp/TCP.h" diff --git a/src/analyzer/protocol/imap/IMAP.h b/src/analyzer/protocol/imap/IMAP.h index 572cdc1ea3..0cc6b0118e 100644 --- a/src/analyzer/protocol/imap/IMAP.h +++ b/src/analyzer/protocol/imap/IMAP.h @@ -2,9 +2,6 @@ #pragma once -// for std::transform -#include - #include "zeek/analyzer/protocol/tcp/TCP.h" #include "analyzer/protocol/imap/imap_pac.h" diff --git a/src/analyzer/protocol/krb/KRB.h b/src/analyzer/protocol/krb/KRB.h index 2e737f6d96..d30490eb82 100644 --- a/src/analyzer/protocol/krb/KRB.h +++ b/src/analyzer/protocol/krb/KRB.h @@ -2,15 +2,15 @@ #pragma once +// This is needed for USE_KRB5 below. #include "zeek/zeek-config.h" -#include - #ifdef USE_KRB5 #include #endif -#include "analyzer/protocol/krb/krb_pac.h" +#include "zeek/analyzer/Analyzer.h" +#include "zeek/analyzer/protocol/krb/krb_pac.h" namespace zeek::analyzer::krb { diff --git a/src/analyzer/protocol/mime/MIME.h b/src/analyzer/protocol/mime/MIME.h index c9079b3900..62c538a511 100644 --- a/src/analyzer/protocol/mime/MIME.h +++ b/src/analyzer/protocol/mime/MIME.h @@ -4,7 +4,6 @@ #include #include -#include #include #include "zeek/Reporter.h" diff --git a/src/analyzer/protocol/mqtt/MQTT.h b/src/analyzer/protocol/mqtt/MQTT.h index 2818402b66..546a8010d9 100644 --- a/src/analyzer/protocol/mqtt/MQTT.h +++ b/src/analyzer/protocol/mqtt/MQTT.h @@ -4,7 +4,6 @@ #pragma once -#include "zeek/ID.h" #include "zeek/analyzer/protocol/tcp/TCP.h" namespace binpac { diff --git a/src/analyzer/protocol/mysql/MySQL.h b/src/analyzer/protocol/mysql/MySQL.h index 5f7b8abcde..ed5dee4b4f 100644 --- a/src/analyzer/protocol/mysql/MySQL.h +++ b/src/analyzer/protocol/mysql/MySQL.h @@ -2,7 +2,6 @@ #pragma once -#include "zeek/analyzer/protocol/mysql/events.bif.h" #include "zeek/analyzer/protocol/mysql/mysql_pac.h" #include "zeek/analyzer/protocol/tcp/TCP.h" diff --git a/src/analyzer/protocol/ncp/NCP.h b/src/analyzer/protocol/ncp/NCP.h index 4ccd3c1186..590158c99d 100644 --- a/src/analyzer/protocol/ncp/NCP.h +++ b/src/analyzer/protocol/ncp/NCP.h @@ -17,7 +17,6 @@ // // http://faydoc.tripod.com/structures/21/2149.htm -#include "zeek/NetVar.h" #include "zeek/analyzer/protocol/tcp/TCP.h" #include "analyzer/protocol/ncp/ncp_pac.h" diff --git a/src/analyzer/protocol/ntlm/NTLM.h b/src/analyzer/protocol/ntlm/NTLM.h index fda392405a..a741c48812 100644 --- a/src/analyzer/protocol/ntlm/NTLM.h +++ b/src/analyzer/protocol/ntlm/NTLM.h @@ -2,7 +2,6 @@ #pragma once -#include "zeek/analyzer/protocol/ntlm/events.bif.h" #include "zeek/analyzer/protocol/ntlm/ntlm_pac.h" #include "zeek/analyzer/protocol/tcp/TCP.h" diff --git a/src/analyzer/protocol/ntp/NTP.h b/src/analyzer/protocol/ntp/NTP.h index 2b1412e5dc..e67553658d 100644 --- a/src/analyzer/protocol/ntp/NTP.h +++ b/src/analyzer/protocol/ntp/NTP.h @@ -2,9 +2,7 @@ #pragma once -#include "zeek/analyzer/protocol/ntp/events.bif.h" #include "zeek/analyzer/protocol/ntp/ntp_pac.h" -#include "zeek/analyzer/protocol/ntp/types.bif.h" namespace zeek::analyzer::ntp { diff --git a/src/analyzer/protocol/radius/RADIUS.h b/src/analyzer/protocol/radius/RADIUS.h index baca03ee4f..c3d1069411 100644 --- a/src/analyzer/protocol/radius/RADIUS.h +++ b/src/analyzer/protocol/radius/RADIUS.h @@ -2,7 +2,6 @@ #pragma once -#include "zeek/analyzer/protocol/radius/events.bif.h" #include "zeek/analyzer/protocol/radius/radius_pac.h" namespace zeek::analyzer::radius { diff --git a/src/analyzer/protocol/rdp/RDP.h b/src/analyzer/protocol/rdp/RDP.h index 832127b3c7..c89107fb44 100644 --- a/src/analyzer/protocol/rdp/RDP.h +++ b/src/analyzer/protocol/rdp/RDP.h @@ -2,7 +2,6 @@ #pragma once -#include "zeek/analyzer/protocol/rdp/events.bif.h" #include "zeek/analyzer/protocol/rdp/rdp_pac.h" #include "zeek/analyzer/protocol/tcp/TCP.h" diff --git a/src/analyzer/protocol/rdp/RDPEUDP.h b/src/analyzer/protocol/rdp/RDPEUDP.h index 5b3222e92f..5e8d0c52a9 100644 --- a/src/analyzer/protocol/rdp/RDPEUDP.h +++ b/src/analyzer/protocol/rdp/RDPEUDP.h @@ -2,7 +2,6 @@ #pragma once -#include "zeek/analyzer/protocol/rdp/events.bif.h" #include "zeek/analyzer/protocol/rdp/rdpeudp_pac.h" namespace zeek::analyzer::rdpeudp { diff --git a/src/analyzer/protocol/rfb/RFB.h b/src/analyzer/protocol/rfb/RFB.h index 9d799a9271..2337ba90c2 100644 --- a/src/analyzer/protocol/rfb/RFB.h +++ b/src/analyzer/protocol/rfb/RFB.h @@ -2,7 +2,6 @@ #pragma once -#include "zeek/analyzer/protocol/rfb/events.bif.h" #include "zeek/analyzer/protocol/rfb/rfb_pac.h" #include "zeek/analyzer/protocol/tcp/TCP.h" diff --git a/src/analyzer/protocol/rpc/NFS.h b/src/analyzer/protocol/rpc/NFS.h index 5b1c74513a..8633b78878 100644 --- a/src/analyzer/protocol/rpc/NFS.h +++ b/src/analyzer/protocol/rpc/NFS.h @@ -2,7 +2,6 @@ #pragma once -#include "zeek/NetVar.h" #include "zeek/analyzer/protocol/rpc/RPC.h" namespace zeek::analyzer::rpc { diff --git a/src/analyzer/protocol/rpc/RPC.h b/src/analyzer/protocol/rpc/RPC.h index 7654fb6141..8e198db983 100644 --- a/src/analyzer/protocol/rpc/RPC.h +++ b/src/analyzer/protocol/rpc/RPC.h @@ -2,7 +2,6 @@ #pragma once -#include "zeek/NetVar.h" #include "zeek/analyzer/protocol/tcp/TCP.h" namespace zeek::analyzer::rpc { diff --git a/src/analyzer/protocol/rpc/XDR.h b/src/analyzer/protocol/rpc/XDR.h index 846d9dfd6c..89208726ea 100644 --- a/src/analyzer/protocol/rpc/XDR.h +++ b/src/analyzer/protocol/rpc/XDR.h @@ -5,8 +5,6 @@ #include #include -#include "zeek/util.h" - namespace zeek::analyzer::rpc { extern uint32_t extract_XDR_uint32(const u_char*& buf, int& len); diff --git a/src/analyzer/protocol/sip/SIP.h b/src/analyzer/protocol/sip/SIP.h index 5f0f652620..634e23a6dd 100644 --- a/src/analyzer/protocol/sip/SIP.h +++ b/src/analyzer/protocol/sip/SIP.h @@ -2,7 +2,6 @@ #pragma once -#include "zeek/analyzer/protocol/sip/events.bif.h" #include "zeek/analyzer/protocol/sip/sip_pac.h" namespace zeek::analyzer::sip { diff --git a/src/analyzer/protocol/snmp/SNMP.h b/src/analyzer/protocol/snmp/SNMP.h index 63edb063fe..3800263ac9 100644 --- a/src/analyzer/protocol/snmp/SNMP.h +++ b/src/analyzer/protocol/snmp/SNMP.h @@ -2,7 +2,8 @@ #pragma once -#include "analyzer/protocol/snmp/snmp_pac.h" +#include "zeek/analyzer/Analyzer.h" +#include "zeek/analyzer/protocol/snmp/snmp_pac.h" namespace zeek::analyzer::snmp { diff --git a/src/analyzer/protocol/snmp/snmp.pac b/src/analyzer/protocol/snmp/snmp.pac index c345f98f49..dafd2cdac2 100644 --- a/src/analyzer/protocol/snmp/snmp.pac +++ b/src/analyzer/protocol/snmp/snmp.pac @@ -2,7 +2,6 @@ %include zeek.pac %extern{ -#include "zeek/Reporter.h" #include "zeek/analyzer/protocol/snmp/types.bif.h" #include "zeek/analyzer/protocol/snmp/events.bif.h" %} diff --git a/src/analyzer/protocol/ssh/SSH.h b/src/analyzer/protocol/ssh/SSH.h index 284e0c828e..2adba14fde 100644 --- a/src/analyzer/protocol/ssh/SSH.h +++ b/src/analyzer/protocol/ssh/SSH.h @@ -2,7 +2,6 @@ #pragma once -#include "zeek/analyzer/protocol/ssh/events.bif.h" #include "zeek/analyzer/protocol/ssh/ssh_pac.h" #include "zeek/analyzer/protocol/tcp/TCP.h" diff --git a/src/analyzer/protocol/ssl/DTLS.h b/src/analyzer/protocol/ssl/DTLS.h index 8b7f95bdcb..04d564e9ea 100644 --- a/src/analyzer/protocol/ssl/DTLS.h +++ b/src/analyzer/protocol/ssl/DTLS.h @@ -2,7 +2,7 @@ #pragma once -#include "zeek/analyzer/protocol/ssl/events.bif.h" +#include "zeek/analyzer/Analyzer.h" namespace binpac { namespace DTLS { diff --git a/src/analyzer/protocol/ssl/SSL.h b/src/analyzer/protocol/ssl/SSL.h index e721e0e600..4a08259fe9 100644 --- a/src/analyzer/protocol/ssl/SSL.h +++ b/src/analyzer/protocol/ssl/SSL.h @@ -3,7 +3,6 @@ #pragma once #include "zeek/analyzer/protocol/pia/PIA.h" -#include "zeek/analyzer/protocol/ssl/events.bif.h" #include "zeek/analyzer/protocol/tcp/TCP.h" namespace binpac { diff --git a/src/analyzer/protocol/syslog/legacy/Syslog.h b/src/analyzer/protocol/syslog/legacy/Syslog.h index d64f8bc40b..fdb552dd7c 100644 --- a/src/analyzer/protocol/syslog/legacy/Syslog.h +++ b/src/analyzer/protocol/syslog/legacy/Syslog.h @@ -2,7 +2,7 @@ #pragma once -#include "zeek/analyzer/protocol/tcp/TCP.h" +#include "zeek/analyzer/Analyzer.h" #include "analyzer/protocol/syslog/legacy/syslog_pac.h" diff --git a/src/analyzer/protocol/tcp/TCP.h b/src/analyzer/protocol/tcp/TCP.h index b804352cee..74d92ceb16 100644 --- a/src/analyzer/protocol/tcp/TCP.h +++ b/src/analyzer/protocol/tcp/TCP.h @@ -3,10 +3,8 @@ #pragma once #include "zeek/Conn.h" -#include "zeek/IPAddr.h" #include "zeek/analyzer/Analyzer.h" #include "zeek/analyzer/protocol/tcp/TCP_Endpoint.h" -#include "zeek/analyzer/protocol/tcp/TCP_Flags.h" #include "zeek/packet_analysis/protocol/tcp/TCPSessionAdapter.h" namespace zeek::analyzer::pia { diff --git a/src/analyzer/protocol/zip/ZIP.h b/src/analyzer/protocol/zip/ZIP.h index c82d575be4..cf161e08ca 100644 --- a/src/analyzer/protocol/zip/ZIP.h +++ b/src/analyzer/protocol/zip/ZIP.h @@ -2,8 +2,6 @@ #pragma once -#include "zeek/zeek-config.h" - #include #include "zeek/analyzer/protocol/tcp/TCP.h" diff --git a/src/file_analysis/Component.h b/src/file_analysis/Component.h index f3a9facc3c..6ae8228d9d 100644 --- a/src/file_analysis/Component.h +++ b/src/file_analysis/Component.h @@ -2,8 +2,6 @@ #pragma once -#include "zeek/zeek-config.h" - #include "zeek/Tag.h" #include "zeek/plugin/Component.h" diff --git a/src/file_analysis/File.cc b/src/file_analysis/File.cc index 73d98fdbd9..8b52ddf25b 100644 --- a/src/file_analysis/File.cc +++ b/src/file_analysis/File.cc @@ -2,21 +2,21 @@ #include "zeek/file_analysis/File.h" -#include #include +#include "zeek/Conn.h" #include "zeek/Event.h" #include "zeek/Reporter.h" #include "zeek/RuleMatcher.h" #include "zeek/Type.h" #include "zeek/Val.h" #include "zeek/analyzer/Analyzer.h" -#include "zeek/analyzer/Manager.h" #include "zeek/file_analysis/Analyzer.h" #include "zeek/file_analysis/FileReassembler.h" #include "zeek/file_analysis/FileTimer.h" #include "zeek/file_analysis/Manager.h" #include "zeek/file_analysis/analyzer/extract/Extract.h" +#include "zeek/file_analysis/analyzer/extract/events.bif.h" namespace zeek::file_analysis { diff --git a/src/file_analysis/File.h b/src/file_analysis/File.h index 96096555dd..73fb384eb3 100644 --- a/src/file_analysis/File.h +++ b/src/file_analysis/File.h @@ -4,12 +4,10 @@ #include #include -#include #include "zeek/Tag.h" #include "zeek/WeirdState.h" #include "zeek/ZeekArgs.h" -#include "zeek/ZeekList.h" // for ValPList #include "zeek/ZeekString.h" #include "zeek/file_analysis/AnalyzerSet.h" diff --git a/src/file_analysis/FileReassembler.h b/src/file_analysis/FileReassembler.h index 1eb622aacb..96d980151a 100644 --- a/src/file_analysis/FileReassembler.h +++ b/src/file_analysis/FileReassembler.h @@ -7,7 +7,6 @@ namespace zeek { class Connection; -class File; namespace file_analysis { diff --git a/src/file_analysis/analyzer/data_event/DataEvent.h b/src/file_analysis/analyzer/data_event/DataEvent.h index 2af1e892dd..325b0c5198 100644 --- a/src/file_analysis/analyzer/data_event/DataEvent.h +++ b/src/file_analysis/analyzer/data_event/DataEvent.h @@ -2,8 +2,6 @@ #pragma once -#include - #include "zeek/EventHandler.h" #include "zeek/Val.h" #include "zeek/file_analysis/Analyzer.h" diff --git a/src/file_analysis/analyzer/entropy/Entropy.cc b/src/file_analysis/analyzer/entropy/Entropy.cc index 54687ed88e..5f200f2965 100644 --- a/src/file_analysis/analyzer/entropy/Entropy.cc +++ b/src/file_analysis/analyzer/entropy/Entropy.cc @@ -6,6 +6,7 @@ #include "zeek/Event.h" #include "zeek/file_analysis/Manager.h" +#include "zeek/file_analysis/analyzer/entropy/events.bif.h" #include "zeek/util.h" namespace zeek::file_analysis::detail { diff --git a/src/file_analysis/analyzer/entropy/Entropy.h b/src/file_analysis/analyzer/entropy/Entropy.h index 98897d2898..a613f2a4e3 100644 --- a/src/file_analysis/analyzer/entropy/Entropy.h +++ b/src/file_analysis/analyzer/entropy/Entropy.h @@ -2,13 +2,10 @@ #pragma once -#include - #include "zeek/OpaqueVal.h" #include "zeek/Val.h" #include "zeek/file_analysis/Analyzer.h" #include "zeek/file_analysis/File.h" -#include "zeek/file_analysis/analyzer/entropy/events.bif.h" namespace zeek::file_analysis::detail { diff --git a/src/file_analysis/analyzer/extract/Extract.cc b/src/file_analysis/analyzer/extract/Extract.cc index b3635dc6c8..458f5f91e1 100644 --- a/src/file_analysis/analyzer/extract/Extract.cc +++ b/src/file_analysis/analyzer/extract/Extract.cc @@ -5,8 +5,8 @@ #include #include -#include "zeek/Event.h" #include "zeek/file_analysis/Manager.h" +#include "zeek/file_analysis/analyzer/extract/events.bif.h" #include "zeek/util.h" namespace zeek::file_analysis::detail { diff --git a/src/file_analysis/analyzer/extract/Extract.h b/src/file_analysis/analyzer/extract/Extract.h index 8c7e9a56f0..4d11047655 100644 --- a/src/file_analysis/analyzer/extract/Extract.h +++ b/src/file_analysis/analyzer/extract/Extract.h @@ -8,7 +8,6 @@ #include "zeek/Val.h" #include "zeek/file_analysis/Analyzer.h" #include "zeek/file_analysis/File.h" -#include "zeek/file_analysis/analyzer/extract/events.bif.h" namespace zeek::file_analysis::detail { diff --git a/src/file_analysis/analyzer/hash/Hash.h b/src/file_analysis/analyzer/hash/Hash.h index 8bf3d93e1e..b3a30e3d97 100644 --- a/src/file_analysis/analyzer/hash/Hash.h +++ b/src/file_analysis/analyzer/hash/Hash.h @@ -2,8 +2,6 @@ #pragma once -#include - #include "zeek/OpaqueVal.h" #include "zeek/Val.h" #include "zeek/file_analysis/Analyzer.h" diff --git a/src/file_analysis/analyzer/pe/PE.h b/src/file_analysis/analyzer/pe/PE.h index 33d3617415..d2efe24ad7 100644 --- a/src/file_analysis/analyzer/pe/PE.h +++ b/src/file_analysis/analyzer/pe/PE.h @@ -2,9 +2,6 @@ #pragma once -#include - -#include "zeek/File.h" #include "zeek/Val.h" #include "file_analysis/analyzer/pe/pe_pac.h" diff --git a/src/packet_analysis/Component.h b/src/packet_analysis/Component.h index 96df483b69..1d176939cb 100644 --- a/src/packet_analysis/Component.h +++ b/src/packet_analysis/Component.h @@ -2,8 +2,6 @@ #pragma once -#include "zeek/zeek-config.h" - #include #include "zeek/Tag.h" diff --git a/src/packet_analysis/Dispatcher.h b/src/packet_analysis/Dispatcher.h index 96f9e2219d..175631817f 100644 --- a/src/packet_analysis/Dispatcher.h +++ b/src/packet_analysis/Dispatcher.h @@ -3,7 +3,6 @@ #pragma once #include -#include #include #include diff --git a/src/packet_analysis/Manager.h b/src/packet_analysis/Manager.h index 00f36c2b8e..0b5cfc03b1 100644 --- a/src/packet_analysis/Manager.h +++ b/src/packet_analysis/Manager.h @@ -2,7 +2,6 @@ #pragma once -#include "zeek/Func.h" #include "zeek/PacketFilter.h" #include "zeek/Tag.h" #include "zeek/iosource/Packet.h" diff --git a/src/packet_analysis/protocol/ayiya/AYIYA.h b/src/packet_analysis/protocol/ayiya/AYIYA.h index b1fbcddc24..c5a1eb799f 100644 --- a/src/packet_analysis/protocol/ayiya/AYIYA.h +++ b/src/packet_analysis/protocol/ayiya/AYIYA.h @@ -2,8 +2,8 @@ #pragma once +#include "zeek/iosource/Packet.h" #include "zeek/packet_analysis/Analyzer.h" -#include "zeek/packet_analysis/Component.h" namespace zeek::packet_analysis::AYIYA { diff --git a/src/packet_analysis/protocol/fddi/FDDI.h b/src/packet_analysis/protocol/fddi/FDDI.h index 32078a94e5..b89724608e 100644 --- a/src/packet_analysis/protocol/fddi/FDDI.h +++ b/src/packet_analysis/protocol/fddi/FDDI.h @@ -2,8 +2,8 @@ #pragma once +#include "zeek/iosource/Packet.h" #include "zeek/packet_analysis/Analyzer.h" -#include "zeek/packet_analysis/Component.h" namespace zeek::packet_analysis::FDDI { diff --git a/src/packet_analysis/protocol/geneve/Geneve.h b/src/packet_analysis/protocol/geneve/Geneve.h index cec9d93f0d..45d9a48e96 100644 --- a/src/packet_analysis/protocol/geneve/Geneve.h +++ b/src/packet_analysis/protocol/geneve/Geneve.h @@ -2,11 +2,12 @@ #pragma once +#include #include #include "zeek/Span.h" +#include "zeek/iosource/Packet.h" #include "zeek/packet_analysis/Analyzer.h" -#include "zeek/packet_analysis/Component.h" namespace zeek::packet_analysis::Geneve { diff --git a/src/packet_analysis/protocol/gre/GRE.h b/src/packet_analysis/protocol/gre/GRE.h index 6f603531ef..2883600cdf 100644 --- a/src/packet_analysis/protocol/gre/GRE.h +++ b/src/packet_analysis/protocol/gre/GRE.h @@ -2,8 +2,8 @@ #pragma once +#include "zeek/iosource/Packet.h" #include "zeek/packet_analysis/Analyzer.h" -#include "zeek/packet_analysis/Component.h" namespace zeek::packet_analysis::GRE { diff --git a/src/packet_analysis/protocol/icmp/ICMPSessionAdapter.cc b/src/packet_analysis/protocol/icmp/ICMPSessionAdapter.cc index 6ec50f70fc..3dbefd9c62 100644 --- a/src/packet_analysis/protocol/icmp/ICMPSessionAdapter.cc +++ b/src/packet_analysis/protocol/icmp/ICMPSessionAdapter.cc @@ -2,6 +2,7 @@ #include "zeek/packet_analysis/protocol/icmp/ICMPSessionAdapter.h" +#include "zeek/Conn.h" #include "zeek/analyzer/Manager.h" #include "zeek/analyzer/protocol/conn-size/ConnSize.h" diff --git a/src/packet_analysis/protocol/ieee802_11/IEEE802_11.h b/src/packet_analysis/protocol/ieee802_11/IEEE802_11.h index c191b1757a..2f76116e4c 100644 --- a/src/packet_analysis/protocol/ieee802_11/IEEE802_11.h +++ b/src/packet_analysis/protocol/ieee802_11/IEEE802_11.h @@ -2,8 +2,8 @@ #pragma once +#include "zeek/iosource/Packet.h" #include "zeek/packet_analysis/Analyzer.h" -#include "zeek/packet_analysis/Component.h" namespace zeek::packet_analysis::IEEE802_11 { diff --git a/src/packet_analysis/protocol/ieee802_11_radio/IEEE802_11_Radio.h b/src/packet_analysis/protocol/ieee802_11_radio/IEEE802_11_Radio.h index f203c8c51e..0e0078e7a5 100644 --- a/src/packet_analysis/protocol/ieee802_11_radio/IEEE802_11_Radio.h +++ b/src/packet_analysis/protocol/ieee802_11_radio/IEEE802_11_Radio.h @@ -2,8 +2,8 @@ #pragma once +#include "zeek/iosource/Packet.h" #include "zeek/packet_analysis/Analyzer.h" -#include "zeek/packet_analysis/Component.h" namespace zeek::packet_analysis::IEEE802_11_Radio { diff --git a/src/packet_analysis/protocol/ip/IP.cc b/src/packet_analysis/protocol/ip/IP.cc index 3f345cca3b..e57a04d267 100644 --- a/src/packet_analysis/protocol/ip/IP.cc +++ b/src/packet_analysis/protocol/ip/IP.cc @@ -8,7 +8,6 @@ #include "zeek/Event.h" #include "zeek/Frag.h" #include "zeek/IP.h" -#include "zeek/IPAddr.h" #include "zeek/NetVar.h" #include "zeek/PacketFilter.h" #include "zeek/RunState.h" diff --git a/src/packet_analysis/protocol/ip/IPBasedAnalyzer.h b/src/packet_analysis/protocol/ip/IPBasedAnalyzer.h index 729824c4dc..bc6d0d08e8 100644 --- a/src/packet_analysis/protocol/ip/IPBasedAnalyzer.h +++ b/src/packet_analysis/protocol/ip/IPBasedAnalyzer.h @@ -5,7 +5,6 @@ #include #include -#include "zeek/ID.h" #include "zeek/Tag.h" #include "zeek/packet_analysis/Analyzer.h" diff --git a/src/packet_analysis/protocol/linux_sll2/LinuxSLL2.h b/src/packet_analysis/protocol/linux_sll2/LinuxSLL2.h index 6e998315f9..0209ca0562 100644 --- a/src/packet_analysis/protocol/linux_sll2/LinuxSLL2.h +++ b/src/packet_analysis/protocol/linux_sll2/LinuxSLL2.h @@ -2,8 +2,10 @@ #pragma once +#include + +#include "zeek/iosource/Packet.h" #include "zeek/packet_analysis/Analyzer.h" -#include "zeek/packet_analysis/Component.h" namespace zeek::packet_analysis::LinuxSLL2 { diff --git a/src/packet_analysis/protocol/llc/LLC.h b/src/packet_analysis/protocol/llc/LLC.h index 9c584ed412..12609b9b9e 100644 --- a/src/packet_analysis/protocol/llc/LLC.h +++ b/src/packet_analysis/protocol/llc/LLC.h @@ -2,8 +2,8 @@ #pragma once +#include "zeek/iosource/Packet.h" #include "zeek/packet_analysis/Analyzer.h" -#include "zeek/packet_analysis/Component.h" namespace zeek::packet_analysis::LLC { diff --git a/src/packet_analysis/protocol/mpls/MPLS.h b/src/packet_analysis/protocol/mpls/MPLS.h index 0cefd55441..0c94888f23 100644 --- a/src/packet_analysis/protocol/mpls/MPLS.h +++ b/src/packet_analysis/protocol/mpls/MPLS.h @@ -2,8 +2,8 @@ #pragma once +#include "zeek/iosource/Packet.h" #include "zeek/packet_analysis/Analyzer.h" -#include "zeek/packet_analysis/Component.h" namespace zeek::packet_analysis::MPLS { diff --git a/src/packet_analysis/protocol/nflog/NFLog.h b/src/packet_analysis/protocol/nflog/NFLog.h index c434666a9e..88dd6b00ad 100644 --- a/src/packet_analysis/protocol/nflog/NFLog.h +++ b/src/packet_analysis/protocol/nflog/NFLog.h @@ -2,8 +2,8 @@ #pragma once +#include "zeek/iosource/Packet.h" #include "zeek/packet_analysis/Analyzer.h" -#include "zeek/packet_analysis/Component.h" namespace zeek::packet_analysis::NFLog { diff --git a/src/packet_analysis/protocol/novell_802_3/Novell_802_3.h b/src/packet_analysis/protocol/novell_802_3/Novell_802_3.h index 17e30c4da1..116357617e 100644 --- a/src/packet_analysis/protocol/novell_802_3/Novell_802_3.h +++ b/src/packet_analysis/protocol/novell_802_3/Novell_802_3.h @@ -2,8 +2,8 @@ #pragma once +#include "zeek/iosource/Packet.h" #include "zeek/packet_analysis/Analyzer.h" -#include "zeek/packet_analysis/Component.h" namespace zeek::packet_analysis::Novell_802_3 { diff --git a/src/packet_analysis/protocol/ppp/PPP.h b/src/packet_analysis/protocol/ppp/PPP.h index ad3c8f8a29..df8df0e0fc 100644 --- a/src/packet_analysis/protocol/ppp/PPP.h +++ b/src/packet_analysis/protocol/ppp/PPP.h @@ -2,8 +2,8 @@ #pragma once +#include "zeek/iosource/Packet.h" #include "zeek/packet_analysis/Analyzer.h" -#include "zeek/packet_analysis/Component.h" namespace zeek::packet_analysis::PPP { diff --git a/src/packet_analysis/protocol/ppp_serial/PPPSerial.h b/src/packet_analysis/protocol/ppp_serial/PPPSerial.h index ef48485d83..81e3aad658 100644 --- a/src/packet_analysis/protocol/ppp_serial/PPPSerial.h +++ b/src/packet_analysis/protocol/ppp_serial/PPPSerial.h @@ -2,8 +2,8 @@ #pragma once +#include "zeek/iosource/Packet.h" #include "zeek/packet_analysis/Analyzer.h" -#include "zeek/packet_analysis/Component.h" namespace zeek::packet_analysis::PPPSerial { diff --git a/src/packet_analysis/protocol/pppoe/PPPoE.h b/src/packet_analysis/protocol/pppoe/PPPoE.h index 14e91f8fbb..e6c58bd9a8 100644 --- a/src/packet_analysis/protocol/pppoe/PPPoE.h +++ b/src/packet_analysis/protocol/pppoe/PPPoE.h @@ -2,8 +2,8 @@ #pragma once +#include "zeek/iosource/Packet.h" #include "zeek/packet_analysis/Analyzer.h" -#include "zeek/packet_analysis/Component.h" namespace zeek::packet_analysis::PPPoE { diff --git a/src/packet_analysis/protocol/tcp/TCP.h b/src/packet_analysis/protocol/tcp/TCP.h index 5ce37ef0ba..f946e55e9c 100644 --- a/src/packet_analysis/protocol/tcp/TCP.h +++ b/src/packet_analysis/protocol/tcp/TCP.h @@ -2,7 +2,6 @@ #pragma once -#include "zeek/analyzer/protocol/tcp/TCP_Flags.h" #include "zeek/packet_analysis/Analyzer.h" #include "zeek/packet_analysis/Component.h" #include "zeek/packet_analysis/protocol/ip/IPBasedAnalyzer.h" diff --git a/src/packet_analysis/protocol/tcp/TCPSessionAdapter.h b/src/packet_analysis/protocol/tcp/TCPSessionAdapter.h index 0ee029274b..e6d3e47144 100644 --- a/src/packet_analysis/protocol/tcp/TCPSessionAdapter.h +++ b/src/packet_analysis/protocol/tcp/TCPSessionAdapter.h @@ -5,8 +5,6 @@ #include "zeek/Tag.h" #include "zeek/analyzer/protocol/tcp/TCP_Endpoint.h" #include "zeek/analyzer/protocol/tcp/TCP_Flags.h" -#include "zeek/packet_analysis/Analyzer.h" -#include "zeek/packet_analysis/Component.h" #include "zeek/packet_analysis/protocol/ip/SessionAdapter.h" #include "zeek/session/Manager.h" diff --git a/src/packet_analysis/protocol/teredo/Teredo.h b/src/packet_analysis/protocol/teredo/Teredo.h index d4577d02ae..7e2ca41948 100644 --- a/src/packet_analysis/protocol/teredo/Teredo.h +++ b/src/packet_analysis/protocol/teredo/Teredo.h @@ -5,7 +5,6 @@ #include #include "zeek/Conn.h" -#include "zeek/NetVar.h" #include "zeek/RE.h" #include "zeek/Reporter.h" #include "zeek/packet_analysis/Analyzer.h" diff --git a/src/packet_analysis/protocol/vntag/VNTag.h b/src/packet_analysis/protocol/vntag/VNTag.h index cc731af4e8..792e6a4749 100644 --- a/src/packet_analysis/protocol/vntag/VNTag.h +++ b/src/packet_analysis/protocol/vntag/VNTag.h @@ -2,8 +2,8 @@ #pragma once +#include "zeek/iosource/Packet.h" #include "zeek/packet_analysis/Analyzer.h" -#include "zeek/packet_analysis/Component.h" namespace zeek::packet_analysis::VNTag { diff --git a/src/packet_analysis/protocol/vxlan/VXLAN.h b/src/packet_analysis/protocol/vxlan/VXLAN.h index a9fb002eb3..8684075325 100644 --- a/src/packet_analysis/protocol/vxlan/VXLAN.h +++ b/src/packet_analysis/protocol/vxlan/VXLAN.h @@ -2,8 +2,8 @@ #pragma once +#include "zeek/iosource/Packet.h" #include "zeek/packet_analysis/Analyzer.h" -#include "zeek/packet_analysis/Component.h" namespace zeek::packet_analysis::VXLAN { diff --git a/src/spicy/manager.cc b/src/spicy/manager.cc index b7cacd435f..6c5a9268f3 100644 --- a/src/spicy/manager.cc +++ b/src/spicy/manager.cc @@ -24,6 +24,7 @@ #include +#include "zeek/Event.h" #include "zeek/analyzer/Manager.h" #include "zeek/file_analysis/Manager.h" #include "zeek/packet_analysis/Manager.h" diff --git a/testing/btest/plugins/protocol-plugin/src/Foo.cc b/testing/btest/plugins/protocol-plugin/src/Foo.cc index 5c27f3a3a9..be788e119c 100644 --- a/testing/btest/plugins/protocol-plugin/src/Foo.cc +++ b/testing/btest/plugins/protocol-plugin/src/Foo.cc @@ -2,6 +2,7 @@ #include "Foo.h" #include "zeek/EventRegistry.h" +#include "zeek/Func.h" #include "zeek/analyzer/protocol/tcp/TCP_Reassembler.h" #include "events.bif.h"