From c8c2c6952fe8cd35e3ecd18da3bdd1b271068dcb Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Tue, 4 Aug 2020 16:21:28 -0700 Subject: [PATCH 1/2] Remove dbg_read_internal_state() It's never had a definition anyway and the namespacing/deprecation process was now causing a compile error in debug/fuzzing builds for me w/ GCC: src/fuzzers/libzeek_fuzzer_shared.so: error: undefined reference to 'zeek::detail::dbg_read_internal_state()' --- src/Debug.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/Debug.h b/src/Debug.h index a5fbb805b8..0a915df07c 100644 --- a/src/Debug.h +++ b/src/Debug.h @@ -166,11 +166,6 @@ int dbg_execute_command(const char* cmd); // Interactive expression evaluation. zeek::ValPtr dbg_eval_expr(const char* expr); -// Extra debugging facilities. -// TODO: current connections, memory allocated, other internal data structures. -// ### Note: not currently defined. -int dbg_read_internal_state(); - // Get line that looks like "In FnFoo(arg = val) at File:Line". std::string get_context_description(const zeek::detail::Stmt* stmt, const zeek::detail::Frame* frame); @@ -203,7 +198,6 @@ constexpr auto dbg_shutdown_debugger [[deprecated("Remove in v4.1. Use zeek::det constexpr auto dbg_handle_debug_input [[deprecated("Remove in v4.1. Use zeek::detail::dbg_handle_debug_input.")]] = zeek::detail::dbg_handle_debug_input; constexpr auto dbg_execute_command [[deprecated("Remove in v4.1. Use zeek::detail::dbg_execute_command.")]] = zeek::detail::dbg_execute_command; constexpr auto dbg_eval_expr [[deprecated("Remove in v4.1. Use zeek::detail::dbg_eval_expr.")]] = zeek::detail::dbg_eval_expr; -constexpr auto dbg_read_internal_state [[deprecated("Remove in v4.1. Use zeek::detail::dbg_read_internal_state.")]] = zeek::detail::dbg_read_internal_state; constexpr auto get_context_description [[deprecated("Remove in v4.1. Use zeek::detail::get_context_description.")]] = zeek::detail::get_context_description; constexpr auto debug_msg [[deprecated("Remove in v4.1. Use zeek::detail::debug_msg.")]] = zeek::detail::debug_msg; From 5d5adcbffde223b5f315f2ad82dc0d9b761b92a8 Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Tue, 4 Aug 2020 16:28:19 -0700 Subject: [PATCH 2/2] Fix deprecation warnings in fuzz targets --- src/fuzzers/packet-fuzzer.cc | 4 ++-- src/fuzzers/pop3-fuzzer.cc | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/fuzzers/packet-fuzzer.cc b/src/fuzzers/packet-fuzzer.cc index 27c9473447..e771f4502e 100644 --- a/src/fuzzers/packet-fuzzer.cc +++ b/src/fuzzers/packet-fuzzer.cc @@ -25,14 +25,14 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) if ( ! chunk ) break; - Packet pkt; + zeek::Packet pkt; auto timestamp = 42; pkt_timeval ts = {timestamp, 0}; pkt.Init(DLT_RAW, &ts, chunk->size, chunk->size, chunk->data.get(), false, ""); try { - sessions->NextPacket(timestamp, &pkt); + zeek::sessions->NextPacket(timestamp, &pkt); } catch ( binpac::Exception const &e ) { diff --git a/src/fuzzers/pop3-fuzzer.cc b/src/fuzzers/pop3-fuzzer.cc index 04c4eddd2c..cbba377722 100644 --- a/src/fuzzers/pop3-fuzzer.cc +++ b/src/fuzzers/pop3-fuzzer.cc @@ -18,17 +18,17 @@ static zeek::Connection* add_connection() static constexpr double network_time_start = 1439471031; net_update_time(network_time_start); - Packet p; - ConnID conn_id; - conn_id.src_addr = IPAddr("1.2.3.4"); - conn_id.dst_addr = IPAddr("5.6.7.8"); + zeek::Packet p; + zeek::ConnID conn_id; + 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); - ConnIDKey key = BuildConnIDKey(conn_id); - zeek::Connection* conn = new Connection(sessions, key, network_time_start, + zeek::detail::ConnIDKey key = zeek::detail::BuildConnIDKey(conn_id); + zeek::Connection* conn = new zeek::Connection(zeek::sessions, key, network_time_start, &conn_id, 1, &p, nullptr); conn->SetTransport(TRANSPORT_TCP); - sessions->Insert(conn); + zeek::sessions->Insert(conn); return conn; }