Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Simplify reassembly code using DataBlockList::LastBlock()

Browse source
This commit is contained in:
Jon Siwek 2019-09-24 10:23:24 -07:00
parent 5ce68bd20a
commit 1253a61340
5 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/analyzer/protocol/tcp/TCP_Reassembler.cc
View file

@ -68,7 +68,7 @@ void TCP_Reassembler::Done()
{ // Record any undelivered data.
if ( ! block_list.Empty() )
{
auto last_block = std::prev(block_list.End())->second;
const auto& last_block = block_list.LastBlock();
if ( last_reassem_seq < last_block.upper )
RecordToSeq(last_reassem_seq, last_block.upper,
@ -91,7 +91,7 @@ uint64_t TCP_Reassembler::NumUndeliveredBytes() const
if ( block_list.Empty() )
return 0;
auto last_block = std::prev(block_list.End())->second;
const auto& last_block = block_list.LastBlock();
return last_block.upper - last_reassem_seq;
}
@ -289,7 +289,7 @@ void TCP_Reassembler::MatchUndelivered(uint64_t up_to_seq, bool use_last_upper)
if ( block_list.Empty() || ! rule_matcher )
return;
const auto& last_block = std::prev(block_list.End())->second;
const auto& last_block = block_list.LastBlock();
if ( use_last_upper )
up_to_seq = last_block.upper;