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

Merge remote-tracking branch 'origin/topic/timw/fix-fuzzer-conn-key-deprecation'

Browse source 
* origin/topic/timw/fix-fuzzer-conn-key-deprecation:
  Fix ConnKey deprecation warnings from generic fuzzer
This commit is contained in:
Tim Wojtulewicz 2025-07-29 07:41:13 -07:00
commit 9f3a1a135f
3 changed files with 13 additions and 11 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.794 | 2025-07-29 07:41:13 -0700
* Fix ConnKey deprecation warnings from generic fuzzer (Tim Wojtulewicz, Corelight)
8.0.0-dev.792 | 2025-07-29 07:19:25 -0700 8.0.0-dev.792 | 2025-07-29 07:19:25 -0700
* Fix types passed to some of the IRC analyzer events (Tim Wojtulewicz, Corelight) * Fix types passed to some of the IRC analyzer events (Tim Wojtulewicz, Corelight)

2
VERSION
View file

@ -1 +1 @@
8.0.0-dev.792 8.0.0-dev.794

18
src/fuzzers/generic-analyzer-fuzzer.cc
View file

@ -17,9 +17,11 @@
#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/analyzer/protocol/tcp/TCP.h" #include "zeek/analyzer/protocol/tcp/TCP.h"
#include "zeek/conn_key/Manager.h"
#include "zeek/fuzzers/FuzzBuffer.h" #include "zeek/fuzzers/FuzzBuffer.h"
#include "zeek/fuzzers/fuzzer-setup.h" #include "zeek/fuzzers/fuzzer-setup.h"
#include "zeek/packet_analysis/protocol/ip/SessionAdapter.h" #include "zeek/packet_analysis/protocol/ip/SessionAdapter.h"
#include "zeek/packet_analysis/protocol/ip/conn_key/IPBasedConnKey.h"
#include "zeek/packet_analysis/protocol/tcp/TCPSessionAdapter.h" #include "zeek/packet_analysis/protocol/tcp/TCPSessionAdapter.h"
#include "zeek/packet_analysis/protocol/udp/UDPSessionAdapter.h" #include "zeek/packet_analysis/protocol/udp/UDPSessionAdapter.h"
#include "zeek/session/Manager.h" #include "zeek/session/Manager.h"
@ -33,7 +35,7 @@ static const char* FUZZ_ANALYZER_TRANSPORT = TOSTRING(ZEEK_FUZZ_ANALYZER_TRANSPO
class Fuzzer { class Fuzzer {
public: public:
Fuzzer(TransportProto proto, const zeek::Tag& analyzer_tag) : proto{proto}, analyzer_tag{analyzer_tag} {} Fuzzer(TransportProto proto, zeek::Tag analyzer_tag) : proto{proto}, analyzer_tag{std::move(analyzer_tag)} {}
virtual ~Fuzzer() {}; virtual ~Fuzzer() {};
@ -41,16 +43,12 @@ public:
static constexpr double network_time_start = 1439471031; static constexpr double network_time_start = 1439471031;
zeek::run_state::detail::update_network_time(network_time_start); zeek::run_state::detail::update_network_time(network_time_start);
zeek::ConnKeyPtr ck = zeek::conn_key_mgr->GetFactory().NewConnKey();
zeek::IPBasedConnKeyPtr key = zeek::IPBasedConnKeyPtr(static_cast<zeek::IPBasedConnKey*>(ck.release()));
key->InitTuple(zeek::IPAddr("1.2.3.4"), htons(23132), zeek::IPAddr("5.6.7.8"), htons(80), proto, false);
zeek::Packet p; zeek::Packet p;
zeek::ConnTuple conn_id; zeek::Connection* conn = new zeek::Connection(std::move(key), network_time_start, 1, &p);
conn_id.src_addr = zeek::IPAddr("1.2.3.4");
conn_id.dst_addr = zeek::IPAddr("5.6.7.8");
conn_id.src_port = htons(23132);
conn_id.dst_port = htons(80);
conn_id.is_one_way = false;
conn_id.proto = proto;
zeek::detail::ConnKey key(conn_id);
zeek::Connection* conn = new zeek::Connection(key, network_time_start, &conn_id, 1, &p);
conn->SetTransport(proto); conn->SetTransport(proto);
zeek::session_mgr->Insert(conn); zeek::session_mgr->Insert(conn);
return conn; return conn;