Move reassembler code to namespaces

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

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;