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

Make Sessions::NextPacket call packet_mgr, fix fuzzer code to do the same

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-09-24 10:18:44 -07:00
parent 1cf251d1ca
commit 8ece1cf484
3 changed files with 5 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

82
src/Sessions.cc
View file

@ -77,87 +77,9 @@ void NetSessions::Done()
{ {
} }
void NetSessions::NextPacket(double t, const Packet* pkt) void NetSessions::NextPacket(double t, Packet* pkt)
{ {
EncapsulationStack* encapsulation = nullptr; packet_mgr->ProcessPacket(pkt);
auto it = pkt->key_store.find("encap");
if ( it != pkt->key_store.end() )
encapsulation = std::any_cast<EncapsulationStack*>(*it);
bool dumped_packet = false;
if ( pkt->hdr_size > pkt->cap_len )
{
Weird("truncated_link_frame", pkt);
return;
}
uint32_t caplen = pkt->cap_len - pkt->hdr_size;
if ( pkt->l3_proto == L3_IPV4 )
{
if ( caplen < sizeof(struct ip) )
{
Weird("truncated_IP", pkt);
return;
}
if ( ! encapsulation )
{
const struct ip* ip = (const struct ip*) (pkt->data + pkt->hdr_size);
IP_Hdr ip_hdr(ip, false);
DoNextPacket(t, pkt, &ip_hdr, encapsulation);
}
else
{
const IP_Hdr* ip_hdr;
auto it = pkt->key_store.find("encap_inner_ip");
if ( it != pkt->key_store.end() )
ip_hdr = std::any_cast<IP_Hdr*>(*it);
else
{
IP_Hdr pkt_ip = pkt->IP();
ip_hdr = &pkt_ip;
}
DoNextPacket(t, pkt, ip_hdr, encapsulation);
}
}
else if ( pkt->l3_proto == L3_IPV6 )
{
if ( caplen < sizeof(struct ip6_hdr) )
{
Weird("truncated_IP", pkt);
return;
}
if ( ! encapsulation )
{
IP_Hdr ip_hdr((const struct ip6_hdr*) (pkt->data + pkt->hdr_size), false, caplen);
DoNextPacket(t, pkt, &ip_hdr, encapsulation);
}
else
{
const IP_Hdr* ip_hdr = nullptr;
auto it = pkt->key_store.find("encap_inner_ip");
if ( it != pkt->key_store.end() )
ip_hdr = std::any_cast<IP_Hdr*>(*it);
else
{
IP_Hdr pkt_ip = pkt->IP();
ip_hdr = &pkt_ip;
}
DoNextPacket(t, pkt, ip_hdr, encapsulation);
}
}
else
{
Weird("unknown_packet_type", pkt);
return;
}
} }
void NetSessions::DoNextPacket(double t, const Packet* pkt, const IP_Hdr* ip_hdr, void NetSessions::DoNextPacket(double t, const Packet* pkt, const IP_Hdr* ip_hdr,

2
src/Sessions.h
View file

@ -50,7 +50,7 @@ public:
// Main entry point for packet processing. // Main entry point for packet processing.
[[deprecated("Remove in v4.1. Do not call this method directly. Packet processing should start with a call to packet_mgr->ProcessPacket().")]] [[deprecated("Remove in v4.1. Do not call this method directly. Packet processing should start with a call to packet_mgr->ProcessPacket().")]]
void NextPacket(double t, const Packet* pkt); void NextPacket(double t, Packet* pkt);
void Done(); // call to drain events before destructing void Done(); // call to drain events before destructing

4
src/fuzzers/packet-fuzzer.cc
View file

@ -2,7 +2,7 @@
#include "iosource/Packet.h" #include "iosource/Packet.h"
#include "Event.h" #include "Event.h"
#include "Sessions.h" #include "packet_analysis/Manager.h"
#include "FuzzBuffer.h" #include "FuzzBuffer.h"
#include "fuzzer-setup.h" #include "fuzzer-setup.h"
@ -32,7 +32,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
try try
{ {
zeek::sessions->NextPacket(timestamp, &pkt); zeek::packet_mgr->ProcessPacket(&pkt);
} }
catch ( binpac::Exception const &e ) catch ( binpac::Exception const &e )
{ {