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

Merge remote-tracking branch 'origin/topic/timw/analyzer-deprecations'

Browse source 
* origin/topic/timw/analyzer-deprecations:
  Add deprecated headers for UDP and ICMP analyzers
This commit is contained in:
Tim Wojtulewicz 2021-06-04 08:29:18 -07:00
commit 9fbbcaad8f
5 changed files with 36 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
CHANGES
View file

@ -1,3 +1,13 @@
4.1.0-dev.704 | 2021-06-04 08:29:18 -0700
* Add deprecated headers for UDP and ICMP analyzers (Tim Wojtulewicz, Corelight)
* Fix handling of IP packets with bogus IP header lengths
Credit to OSS-Fuzz for discovery
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=34711
(Link to details becomes public 30 days after patch release) (Tim Wojtulewicz, Corelight)
4.1.0-dev.700 | 2021-06-03 09:27:57 -0700 4.1.0-dev.700 | 2021-06-03 09:27:57 -0700
* Make update-traces fail when the curl invocation fails (Christian Kreibich, Corelight) * Make update-traces fail when the curl invocation fails (Christian Kreibich, Corelight)

2
VERSION
View file

@ -1 +1 @@
4.1.0-dev.700 4.1.0-dev.704

15
src/analyzer/protocol/icmp/ICMP.h Normal file
View file

@ -0,0 +1,15 @@
#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/ICMPSessionAdapter.h"
#include "zeek/packet_analysis/protocol/icmp/ICMP.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

1
src/analyzer/protocol/tcp/TCP.h
View file

@ -10,7 +10,6 @@
#include "zeek/Conn.h" #include "zeek/Conn.h"
namespace zeek::analyzer::pia { class PIA_TCP; } namespace zeek::analyzer::pia { class PIA_TCP; }
namespace zeek::packet_analysis::TCP { class TCPSessionAdapter; }
namespace zeek::analyzer::tcp { namespace zeek::analyzer::tcp {

10
src/analyzer/protocol/udp/UDP.h Normal file
View file

@ -0,0 +1,10 @@
#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