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

Deprecate the internal int/uint types in favor of the cstdint types they were based on

Browse source
This commit is contained in:
Tim Wojtulewicz 2019-07-30 11:38:42 -07:00
parent 18e4976c6c
commit 54752ef9a1
218 changed files with 1331 additions and 1323 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/file_analysis/FileReassembler.cc
View file

@ -7,7 +7,7 @@ namespace file_analysis {
class File;
FileReassembler::FileReassembler(File *f, uint64 starting_offset)
FileReassembler::FileReassembler(File *f, uint64_t starting_offset)
: Reassembler(starting_offset, REASSEM_FILE), the_file(f), flushing(false)
{
}
@ -21,7 +21,7 @@ FileReassembler::~FileReassembler()
{
}
uint64 FileReassembler::Flush()
uint64_t FileReassembler::Flush()
{
if ( flushing )
return 0;
@ -30,7 +30,7 @@ uint64 FileReassembler::Flush()
{
// This is expected to call back into FileReassembler::Undelivered().
flushing = true;
uint64 rval = TrimToSeq(last_block->upper);
uint64_t rval = TrimToSeq(last_block->upper);
flushing = false;
return rval;
}
@ -38,13 +38,13 @@ uint64 FileReassembler::Flush()
return 0;
}
uint64 FileReassembler::FlushTo(uint64 sequence)
uint64_t FileReassembler::FlushTo(uint64_t sequence)
{
if ( flushing )
return 0;
flushing = true;
uint64 rval = TrimToSeq(sequence);
uint64_t rval = TrimToSeq(sequence);
flushing = false;
last_reassem_seq = sequence;
return rval;
@ -61,7 +61,7 @@ void FileReassembler::BlockInserted(DataBlock* start_block)
{
if ( b->seq == last_reassem_seq )
{ // New stuff.
uint64 len = b->Size();
uint64_t len = b->Size();
last_reassem_seq += len;
the_file->DeliverStream(b->block, len);
}
@ -71,7 +71,7 @@ void FileReassembler::BlockInserted(DataBlock* start_block)
TrimToSeq(last_reassem_seq);
}
void FileReassembler::Undelivered(uint64 up_to_seq)
void FileReassembler::Undelivered(uint64_t up_to_seq)
{
// If we have blocks that begin below up_to_seq, deliver them.
DataBlock* b = blocks;
@ -89,8 +89,8 @@ void FileReassembler::Undelivered(uint64 up_to_seq)
// Block is beyond what we need to process at this point.
break;
uint64 gap_at_seq = last_reassem_seq;
uint64 gap_len = b->seq - last_reassem_seq;
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(b);
@ -106,7 +106,7 @@ void FileReassembler::Undelivered(uint64 up_to_seq)
}
}
void FileReassembler::Overlap(const u_char* b1, const u_char* b2, uint64 n)
void FileReassembler::Overlap(const u_char* b1, const u_char* b2, uint64_t n)
{
// Not doing anything here yet.
}