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

Change FragReassembler to use a tuple as a key and use std::map for fragments in Sessions

Browse source
This commit is contained in:
Tim Wojtulewicz 2019-08-01 14:20:10 -07:00
parent 57f29f3e7c
commit a4b8aa1f30
4 changed files with 26 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Frag.h
View file

@ -3,6 +3,8 @@
#ifndef frag_h
#define frag_h
#include <tuple>
#include "util.h"
#include "IP.h"
#include "Net.h"
@ -17,10 +19,12 @@ class FragTimer;
typedef void (FragReassembler::*frag_timer_func)(double t);
using FragReassemblerKey = std::tuple<IPAddr, IPAddr, bro_uint_t>;
class FragReassembler : public Reassembler {
public:
FragReassembler(NetSessions* s, const IP_Hdr* ip, const u_char* pkt,
HashKey* k, double t);
const FragReassemblerKey& k, double t);
~FragReassembler() override;
void AddFragment(double t, const IP_Hdr* ip, const u_char* pkt);
@ -30,7 +34,7 @@ public:
void ClearTimer() { expire_timer = 0; }
const IP_Hdr* ReassembledPkt() { return reassembled_pkt; }
HashKey* Key() const { return key; }
const FragReassemblerKey& Key() const { return key; }
protected:
void BlockInserted(DataBlock* start_block) override;
@ -43,7 +47,7 @@ protected:
NetSessions* s;
uint64_t frag_size; // size of fully reassembled fragment
uint16_t next_proto; // first IPv6 fragment header's next proto field
HashKey* key;
FragReassemblerKey key;
FragTimer* expire_timer;
};