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

Move reassembler code to namespaces

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-07-22 11:49:35 -07:00
parent e3ee1860b8
commit 0355d13099
12 changed files with 59 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Sessions.h
View file

@ -59,8 +59,8 @@ public:
// Returns a reassembled packet, or nil if there are still
// some missing fragments.
FragReassembler* NextFragment(double t, const zeek::IP_Hdr* ip,
const u_char* pkt);
detail::FragReassembler* NextFragment(double t, const zeek::IP_Hdr* ip,
const u_char* pkt);
// Looks up the connection referred to by the given Val,
// which should be a conn_id record. Returns nil if there's
@ -68,7 +68,7 @@ public:
Connection* FindConnection(zeek::Val* v);
void Remove(Connection* c);
void Remove(FragReassembler* f);
void Remove(detail::FragReassembler* f);
void Insert(Connection* c);
@ -177,7 +177,7 @@ protected:
friend class detail::IPTunnelTimer;
using ConnectionMap = std::map<zeek::detail::ConnIDKey, Connection*>;
using FragmentMap = std::map<FragReassemblerKey, FragReassembler*>;
using FragmentMap = std::map<detail::FragReassemblerKey, detail::FragReassembler*>;
Connection* NewConn(const zeek::detail::ConnIDKey& k, double t, const ConnID* id,
const u_char* data, int proto, uint32_t flow_label,