Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-09 01:58:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

6
src/file_analysis/FileReassembler.cc
View file

@ -8,12 +8,12 @@ namespace file_analysis {
class File;
FileReassembler::FileReassembler(File *f, uint64_t starting_offset)
: Reassembler(starting_offset, REASSEM_FILE), the_file(f), flushing(false)
: zeek::Reassembler(starting_offset, zeek::REASSEM_FILE), the_file(f), flushing(false)
{
}
FileReassembler::FileReassembler()
: Reassembler(), the_file(nullptr), flushing(false)
: zeek::Reassembler(), the_file(nullptr), flushing(false)
{
}
@ -50,7 +50,7 @@ uint64_t FileReassembler::FlushTo(uint64_t sequence)
return rval;
}
void FileReassembler::BlockInserted(DataBlockMap::const_iterator it)
void FileReassembler::BlockInserted(zeek::DataBlockMap::const_iterator it)
{
const auto& start_block = it->second;

4
src/file_analysis/FileReassembler.h
View file

@ -11,7 +11,7 @@ namespace file_analysis {
class File;
class FileReassembler final : public Reassembler {
class FileReassembler final : public zeek::Reassembler {
public:
FileReassembler(File* f, uint64_t starting_offset);
@ -51,7 +51,7 @@ protected:
FileReassembler();
void Undelivered(uint64_t up_to_seq) override;
void BlockInserted(DataBlockMap::const_iterator it) override;
void BlockInserted(zeek::DataBlockMap::const_iterator it) override;
void Overlap(const u_char* b1, const u_char* b2, uint64_t n) override;
File* the_file;