Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-05 16:18:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Prep work for IP changes

Browse source 
- Move all of the time handling code out of PktSrc into RunState
- Call packet_mgr->ProcessPacket() from various places to setup layer 2 data in packets
This commit is contained in:
Tim Wojtulewicz 2020-09-23 15:22:02 -07:00
parent 5f1ee35d31
commit 69da2d7b1d
10 changed files with 108 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/iosource/Packet.h
View file

@ -66,8 +66,7 @@ public:
*/
Packet(int link_type, pkt_timeval *ts, uint32_t caplen,
uint32_t len, const u_char *data, bool copy = false,
std::string tag = std::string(""))
: data(nullptr), l2_src(nullptr), l2_dst(nullptr)
std::string tag = "")
{
Init(link_type, ts, caplen, len, data, copy, tag);
}
@ -75,7 +74,7 @@ public:
/**
* Default constructor. For internal use only.
*/
Packet() : data(nullptr), l2_src(nullptr), l2_dst(nullptr)
Packet()
{
pkt_timeval ts = {0, 0};
Init(0, &ts, 0, 0, nullptr);
@ -113,8 +112,8 @@ public:
* differentiating the input streams.
*/
void Init(int link_type, pkt_timeval *ts, uint32_t caplen,
uint32_t len, const u_char *data, bool copy = false,
std::string tag = std::string(""));
uint32_t len, const u_char *data, bool copy = false,
std::string tag = "");
/**
* Interprets the Layer 3 of the packet as IP and returns a
@ -144,13 +143,13 @@ public:
static constexpr const u_char L2_EMPTY_ADDR[L2_ADDR_LEN] = { 0 };
// These are passed in through the constructor.
std::string tag; /// Used in serialization
double time; /// Timestamp reconstituted as float
pkt_timeval ts; /// Capture timestamp
const u_char* data; /// Packet data.
uint32_t len; /// Actual length on wire
uint32_t cap_len; /// Captured packet length
uint32_t link_type; /// pcap link_type (DLT_EN10MB, DLT_RAW, etc)
std::string tag; /// Used in serialization
double time; /// Timestamp reconstituted as float
pkt_timeval ts; /// Capture timestamp
const u_char* data = nullptr; /// Packet data.
uint32_t len; /// Actual length on wire
uint32_t cap_len; /// Captured packet length
uint32_t link_type; /// pcap link_type (DLT_EN10MB, DLT_RAW, etc)
// True if L2 processing succeeded. If data is set on initialization of
// the packet, L2 is assumed to be valid. The packet manager will then
@ -179,12 +178,12 @@ public:
/**
* Layer 2 source address. Valid iff l2_valid is true.
*/
const u_char* l2_src;
const u_char* l2_src = nullptr;
/**
* Layer 2 destination address. Valid iff l2_valid is true.
*/
const u_char* l2_dst;
const u_char* l2_dst = nullptr;
/**
* (Outermost) VLAN tag if any, else 0. Valid iff l2_valid is true.