mirror of
https://github.com/zeek/zeek.git
synced 2025-10-08 09:38:19 +00:00
Reformat Zeek in Spicy style
This largely copies over Spicy's `.clang-format` configuration file. The one place where we deviate is header include order since Zeek depends on headers being included in a certain order.
This commit is contained in:
Benjamin Bannier
parent
7b8e7ed72c
commit
f5a76c1aed
786 changed files with 131714 additions and 153609 deletions
|
|
@ -5,167 +5,146 @@
|
|||
#include "zeek/3rdparty/doctest.h"
|
||||
#include "zeek/file_analysis/File.h"
|
||||
|
||||
namespace zeek::file_analysis
|
||||
{
|
||||
namespace zeek::file_analysis {
|
||||
|
||||
class File;
|
||||
|
||||
FileReassembler::FileReassembler(File* f, uint64_t starting_offset)
|
||||
: Reassembler(starting_offset, REASSEM_FILE), the_file(f), flushing(false)
|
||||
{
|
||||
}
|
||||
: Reassembler(starting_offset, REASSEM_FILE), the_file(f), flushing(false) {}
|
||||
|
||||
uint64_t FileReassembler::Flush()
|
||||
{
|
||||
if ( flushing )
|
||||
return 0;
|
||||
uint64_t FileReassembler::Flush() {
|
||||
if ( flushing )
|
||||
return 0;
|
||||
|
||||
if ( block_list.Empty() )
|
||||
return 0;
|
||||
if ( block_list.Empty() )
|
||||
return 0;
|
||||
|
||||
const auto& last_block = block_list.LastBlock();
|
||||
const auto& last_block = block_list.LastBlock();
|
||||
|
||||
// This is expected to call back into FileReassembler::Undelivered().
|
||||
flushing = true;
|
||||
uint64_t rval = TrimToSeq(last_block.upper);
|
||||
flushing = false;
|
||||
return rval;
|
||||
}
|
||||
// This is expected to call back into FileReassembler::Undelivered().
|
||||
flushing = true;
|
||||
uint64_t rval = TrimToSeq(last_block.upper);
|
||||
flushing = false;
|
||||
return rval;
|
||||
}
|
||||
|
||||
uint64_t FileReassembler::FlushTo(uint64_t sequence)
|
||||
{
|
||||
if ( flushing )
|
||||
return 0;
|
||||
uint64_t FileReassembler::FlushTo(uint64_t sequence) {
|
||||
if ( flushing )
|
||||
return 0;
|
||||
|
||||
flushing = true;
|
||||
uint64_t rval = TrimToSeq(sequence);
|
||||
flushing = false;
|
||||
last_reassem_seq = sequence;
|
||||
return rval;
|
||||
}
|
||||
flushing = true;
|
||||
uint64_t rval = TrimToSeq(sequence);
|
||||
flushing = false;
|
||||
last_reassem_seq = sequence;
|
||||
return rval;
|
||||
}
|
||||
|
||||
void FileReassembler::BlockInserted(DataBlockMap::const_iterator it)
|
||||
{
|
||||
const auto& start_block = it->second;
|
||||
assert(start_block.seq < start_block.upper);
|
||||
if ( start_block.seq > last_reassem_seq || start_block.upper <= last_reassem_seq )
|
||||
return;
|
||||
void FileReassembler::BlockInserted(DataBlockMap::const_iterator it) {
|
||||
const auto& start_block = it->second;
|
||||
assert(start_block.seq < start_block.upper);
|
||||
if ( start_block.seq > last_reassem_seq || start_block.upper <= last_reassem_seq )
|
||||
return;
|
||||
|
||||
while ( it != block_list.End() )
|
||||
{
|
||||
const auto& b = it->second;
|
||||
while ( it != block_list.End() ) {
|
||||
const auto& b = it->second;
|
||||
|
||||
if ( b.seq > last_reassem_seq )
|
||||
break;
|
||||
if ( b.seq > last_reassem_seq )
|
||||
break;
|
||||
|
||||
if ( b.seq == last_reassem_seq )
|
||||
{ // New stuff.
|
||||
uint64_t len = b.Size();
|
||||
last_reassem_seq += len;
|
||||
the_file->DeliverStream(b.block, len);
|
||||
}
|
||||
if ( b.seq == last_reassem_seq ) { // New stuff.
|
||||
uint64_t len = b.Size();
|
||||
last_reassem_seq += len;
|
||||
the_file->DeliverStream(b.block, len);
|
||||
}
|
||||
|
||||
++it;
|
||||
}
|
||||
++it;
|
||||
}
|
||||
|
||||
// Throw out forwarded data
|
||||
TrimToSeq(last_reassem_seq);
|
||||
}
|
||||
// Throw out forwarded data
|
||||
TrimToSeq(last_reassem_seq);
|
||||
}
|
||||
|
||||
void FileReassembler::Undelivered(uint64_t up_to_seq)
|
||||
{
|
||||
// If we have blocks that begin below up_to_seq, deliver them.
|
||||
auto it = block_list.Begin();
|
||||
void FileReassembler::Undelivered(uint64_t up_to_seq) {
|
||||
// If we have blocks that begin below up_to_seq, deliver them.
|
||||
auto it = block_list.Begin();
|
||||
|
||||
while ( it != block_list.End() )
|
||||
{
|
||||
const auto& b = it->second;
|
||||
while ( it != block_list.End() ) {
|
||||
const auto& b = it->second;
|
||||
|
||||
if ( b.seq < last_reassem_seq )
|
||||
{
|
||||
// Already delivered this block.
|
||||
++it;
|
||||
continue;
|
||||
}
|
||||
if ( b.seq < last_reassem_seq ) {
|
||||
// Already delivered this block.
|
||||
++it;
|
||||
continue;
|
||||
}
|
||||
|
||||
if ( b.seq >= up_to_seq )
|
||||
// Block is beyond what we need to process at this point.
|
||||
break;
|
||||
if ( b.seq >= up_to_seq )
|
||||
// Block is beyond what we need to process at this point.
|
||||
break;
|
||||
|
||||
uint64_t gap_at_seq = last_reassem_seq;
|
||||
uint64_t gap_len = b.seq - last_reassem_seq;
|
||||
the_file->Gap(gap_at_seq, gap_len);
|
||||
last_reassem_seq += gap_len;
|
||||
BlockInserted(it);
|
||||
// Inserting a block may cause trimming of what's buffered,
|
||||
// so have to assume 'b' is invalid, hence re-assign to start.
|
||||
it = block_list.Begin();
|
||||
}
|
||||
uint64_t gap_at_seq = last_reassem_seq;
|
||||
uint64_t gap_len = b.seq - last_reassem_seq;
|
||||
the_file->Gap(gap_at_seq, gap_len);
|
||||
last_reassem_seq += gap_len;
|
||||
BlockInserted(it);
|
||||
// Inserting a block may cause trimming of what's buffered,
|
||||
// so have to assume 'b' is invalid, hence re-assign to start.
|
||||
it = block_list.Begin();
|
||||
}
|
||||
|
||||
if ( up_to_seq > last_reassem_seq )
|
||||
{
|
||||
the_file->Gap(last_reassem_seq, up_to_seq - last_reassem_seq);
|
||||
last_reassem_seq = up_to_seq;
|
||||
}
|
||||
}
|
||||
if ( up_to_seq > last_reassem_seq ) {
|
||||
the_file->Gap(last_reassem_seq, up_to_seq - last_reassem_seq);
|
||||
last_reassem_seq = up_to_seq;
|
||||
}
|
||||
}
|
||||
|
||||
void FileReassembler::Overlap(const u_char* b1, const u_char* b2, uint64_t n)
|
||||
{
|
||||
// Not doing anything here yet.
|
||||
}
|
||||
} // end file_analysis
|
||||
void FileReassembler::Overlap(const u_char* b1, const u_char* b2, uint64_t n) {
|
||||
// Not doing anything here yet.
|
||||
}
|
||||
} // namespace zeek::file_analysis
|
||||
|
||||
// Test reassembler logic through FileReassembler.
|
||||
TEST_CASE("file reassembler")
|
||||
{
|
||||
// Can not construct due to protected constructor.
|
||||
class TestFile : public zeek::file_analysis::File
|
||||
{
|
||||
public:
|
||||
TestFile(const std::string& file_id, const std::string& source_name)
|
||||
: zeek::file_analysis::File(file_id, source_name)
|
||||
{
|
||||
}
|
||||
};
|
||||
TEST_CASE("file reassembler") {
|
||||
// Can not construct due to protected constructor.
|
||||
class TestFile : public zeek::file_analysis::File {
|
||||
public:
|
||||
TestFile(const std::string& file_id, const std::string& source_name)
|
||||
: zeek::file_analysis::File(file_id, source_name) {}
|
||||
};
|
||||
|
||||
auto f = std::make_unique<TestFile>("test_file_id", "test_source_name");
|
||||
auto r = std::make_unique<zeek::file_analysis::FileReassembler>(f.get(), 0);
|
||||
auto f = std::make_unique<TestFile>("test_file_id", "test_source_name");
|
||||
auto r = std::make_unique<zeek::file_analysis::FileReassembler>(f.get(), 0);
|
||||
|
||||
const u_char* data = (u_char*)("0123456789ABCDEF");
|
||||
const u_char* data = (u_char*)("0123456789ABCDEF");
|
||||
|
||||
SUBCASE("block overlap and 64bit overflow")
|
||||
{
|
||||
r->NewBlock(0.0, 0xfffffffffffffff7, 3, data);
|
||||
r->NewBlock(0.0, 0xfffffffffffffff7, 15, data);
|
||||
r->NewBlock(0.0, 0xfffffffffffffff3, 15, data);
|
||||
SUBCASE("block overlap and 64bit overflow") {
|
||||
r->NewBlock(0.0, 0xfffffffffffffff7, 3, data);
|
||||
r->NewBlock(0.0, 0xfffffffffffffff7, 15, data);
|
||||
r->NewBlock(0.0, 0xfffffffffffffff3, 15, data);
|
||||
|
||||
// 0xfffffffffffffff3 through 0xffffffffffffffff
|
||||
CHECK_EQ(r->TotalSize(), 12);
|
||||
// 0xfffffffffffffff3 through 0xffffffffffffffff
|
||||
CHECK_EQ(r->TotalSize(), 12);
|
||||
|
||||
// This previously hung with an endless loop.
|
||||
r->Flush();
|
||||
CHECK_FALSE(r->HasBlocks());
|
||||
CHECK_EQ(r->TotalSize(), 0);
|
||||
}
|
||||
// This previously hung with an endless loop.
|
||||
r->Flush();
|
||||
CHECK_FALSE(r->HasBlocks());
|
||||
CHECK_EQ(r->TotalSize(), 0);
|
||||
}
|
||||
|
||||
SUBCASE("reject NewBlock() at 64 bit limit")
|
||||
{
|
||||
r->NewBlock(0.0, 0xffffffffffffffff, 4, data);
|
||||
CHECK_FALSE(r->HasBlocks());
|
||||
CHECK_EQ(r->TotalSize(), 0);
|
||||
}
|
||||
SUBCASE("reject NewBlock() at 64 bit limit") {
|
||||
r->NewBlock(0.0, 0xffffffffffffffff, 4, data);
|
||||
CHECK_FALSE(r->HasBlocks());
|
||||
CHECK_EQ(r->TotalSize(), 0);
|
||||
}
|
||||
|
||||
SUBCASE("truncate NewBlock() to upper 64 bit limit")
|
||||
{
|
||||
r->NewBlock(0.0, 0xfffffffffffffffa, 8, data);
|
||||
CHECK(r->HasBlocks());
|
||||
CHECK_EQ(r->TotalSize(), 5);
|
||||
}
|
||||
SUBCASE("truncate NewBlock() to upper 64 bit limit") {
|
||||
r->NewBlock(0.0, 0xfffffffffffffffa, 8, data);
|
||||
CHECK(r->HasBlocks());
|
||||
CHECK_EQ(r->TotalSize(), 5);
|
||||
}
|
||||
|
||||
SUBCASE("no truncation")
|
||||
{
|
||||
r->NewBlock(0.0, 0xfffffffffffffff7, 8, data);
|
||||
CHECK(r->HasBlocks());
|
||||
CHECK_EQ(r->TotalSize(), 8);
|
||||
}
|
||||
}
|
||||
SUBCASE("no truncation") {
|
||||
r->NewBlock(0.0, 0xfffffffffffffff7, 8, data);
|
||||
CHECK(r->HasBlocks());
|
||||
CHECK_EQ(r->TotalSize(), 8);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue