Fix deprecation warnings in fuzz targets

This commit is contained in:
Jon Siwek 2020-08-04 16:28:19 -07:00
parent c8c2c6952f
commit 5d5adcbffd
2 changed files with 9 additions and 9 deletions

View file

@ -25,14 +25,14 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
if ( ! chunk ) if ( ! chunk )
break; break;
Packet pkt; zeek::Packet pkt;
auto timestamp = 42; auto timestamp = 42;
pkt_timeval ts = {timestamp, 0}; pkt_timeval ts = {timestamp, 0};
pkt.Init(DLT_RAW, &ts, chunk->size, chunk->size, chunk->data.get(), false, ""); pkt.Init(DLT_RAW, &ts, chunk->size, chunk->size, chunk->data.get(), false, "");
try try
{ {
sessions->NextPacket(timestamp, &pkt); zeek::sessions->NextPacket(timestamp, &pkt);
} }
catch ( binpac::Exception const &e ) catch ( binpac::Exception const &e )
{ {

View file

@ -18,17 +18,17 @@ static zeek::Connection* add_connection()
static constexpr double network_time_start = 1439471031; static constexpr double network_time_start = 1439471031;
net_update_time(network_time_start); net_update_time(network_time_start);
Packet p; zeek::Packet p;
ConnID conn_id; zeek::ConnID conn_id;
conn_id.src_addr = IPAddr("1.2.3.4"); conn_id.src_addr = zeek::IPAddr("1.2.3.4");
conn_id.dst_addr = IPAddr("5.6.7.8"); conn_id.dst_addr = zeek::IPAddr("5.6.7.8");
conn_id.src_port = htons(23132); conn_id.src_port = htons(23132);
conn_id.dst_port = htons(80); conn_id.dst_port = htons(80);
ConnIDKey key = BuildConnIDKey(conn_id); zeek::detail::ConnIDKey key = zeek::detail::BuildConnIDKey(conn_id);
zeek::Connection* conn = new Connection(sessions, key, network_time_start, zeek::Connection* conn = new zeek::Connection(zeek::sessions, key, network_time_start,
&conn_id, 1, &p, nullptr); &conn_id, 1, &p, nullptr);
conn->SetTransport(TRANSPORT_TCP); conn->SetTransport(TRANSPORT_TCP);
sessions->Insert(conn); zeek::sessions->Insert(conn);
return conn; return conn;
} }