diff --git a/src/analyzer/protocol/icmp/ICMP.h b/src/analyzer/protocol/icmp/ICMP.h deleted file mode 100644 index 3ee6659230..0000000000 --- a/src/analyzer/protocol/icmp/ICMP.h +++ /dev/null @@ -1,20 +0,0 @@ -#warning \ - "Remove in v5.1. This analyzer has been moved to packet analysis, use 'zeek/packet_analysis/protocol/icmp/ICMPSessionAdapter.h' and/or 'zeek/packet_analysis/protocol/icmp/ICMP.h'." - -#include "zeek/packet_analysis/protocol/icmp/ICMP.h" -#include "zeek/packet_analysis/protocol/icmp/ICMPSessionAdapter.h" - -namespace zeek::analyzer::icmp - { - -using ICMP_Analyzer - [[deprecated("Remove in v5.1. Use zeek::packet_analysis::ICMP::ICMPSessionAdapter.")]] = - zeek::packet_analysis::ICMP::ICMPSessionAdapter; -constexpr auto ICMP4_counterpart - [[deprecated("Remove in v5.1. Use zeek::packet_analysis::ICMP::ICMP4_counterpart.")]] = - zeek::packet_analysis::ICMP::ICMP4_counterpart; -constexpr auto ICMP6_counterpart - [[deprecated("Remove in v5.1. Use zeek::packet_analysis::ICMP::ICMP6_counterpart.")]] = - zeek::packet_analysis::ICMP::ICMP6_counterpart; - - } // namespace zeek::analyzer::icmp diff --git a/src/analyzer/protocol/tcp/TCP.h b/src/analyzer/protocol/tcp/TCP.h index 3b145cb789..0844fb87a9 100644 --- a/src/analyzer/protocol/tcp/TCP.h +++ b/src/analyzer/protocol/tcp/TCP.h @@ -21,10 +21,6 @@ class TCP_Endpoint; class TCP_Reassembler; class TCP_ApplicationAnalyzer; -using TCP_Analyzer - [[deprecated("Remove in v5.1. Use zeek::packet_analysis::TCP::TCPSessionAdapter.")]] = - packet_analysis::TCP::TCPSessionAdapter; - /** * An abstract base class for analyzers for a protocol running on top * of TCP. diff --git a/src/analyzer/protocol/tcp/TCP_Endpoint.h b/src/analyzer/protocol/tcp/TCP_Endpoint.h index 05dbdcda15..d885be3899 100644 --- a/src/analyzer/protocol/tcp/TCP_Endpoint.h +++ b/src/analyzer/protocol/tcp/TCP_Endpoint.h @@ -19,10 +19,6 @@ class TCPSessionAdapter; namespace analyzer::tcp { -using TCP_Analyzer - [[deprecated("Remove in v5.1. Use zeek::packet_analysis::TCP::TCPSessionAdapter.")]] = - zeek::packet_analysis::TCP::TCPSessionAdapter; - class TCP_Reassembler; enum EndpointState diff --git a/src/analyzer/protocol/tcp/TCP_Reassembler.h b/src/analyzer/protocol/tcp/TCP_Reassembler.h index b4c66128c0..105fa9dd46 100644 --- a/src/analyzer/protocol/tcp/TCP_Reassembler.h +++ b/src/analyzer/protocol/tcp/TCP_Reassembler.h @@ -22,10 +22,6 @@ class Analyzer; namespace tcp { -using TCP_Analyzer - [[deprecated("Remove in v5.1. Use zeek::packet_analysis::TCP::TCPSessionAdapter.")]] = - zeek::packet_analysis::TCP::TCPSessionAdapter; - class TCP_Reassembler final : public Reassembler { public: diff --git a/src/analyzer/protocol/udp/UDP.h b/src/analyzer/protocol/udp/UDP.h deleted file mode 100644 index 71efefd361..0000000000 --- a/src/analyzer/protocol/udp/UDP.h +++ /dev/null @@ -1,13 +0,0 @@ -#warning \ - "Remove in v5.1. This analyzer has been moved to packet analysis, use 'zeek/packet_analysis/protocol/udp/UDPSessionAdapter.h'." - -#include "zeek/packet_analysis/protocol/udp/UDPSessionAdapter.h" - -namespace zeek::analyzer::udp - { - -using UDP_Analyzer - [[deprecated("Remove in v5.1. Use zeek::packet_analysis::UDP::UDPSessionAdapter.")]] = - zeek::packet_analysis::UDP::UDPSessionAdapter; - - } // namespace zeek::analyzer::udp