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

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

32
src/analyzer/protocol/tcp/TCP_Reassembler.h
View file

@ -39,12 +39,12 @@ public:
//
// If we're not processing contents, then naturally each of
// these is empty.
void SizeBufferedData(uint64& waiting_on_hole, uint64& waiting_on_ack) const;
void SizeBufferedData(uint64_t& waiting_on_hole, uint64_t& waiting_on_ack) const;
// How much data is pending delivery since it's not yet reassembled.
// Includes the data due to holes (so this value is a bit different
// from waiting_on_hole above; and is computed in a different fashion).
uint64 NumUndeliveredBytes() const
uint64_t NumUndeliveredBytes() const
{
if ( last_block )
return last_block->upper - last_reassem_seq;
@ -55,15 +55,15 @@ public:
void SetContentsFile(BroFile* f);
BroFile* GetContentsFile() const { return record_contents_file; }
void MatchUndelivered(uint64 up_to_seq, bool use_last_upper);
void MatchUndelivered(uint64_t up_to_seq, bool use_last_upper);
// Skip up to seq, as if there's a content gap.
// Can be used to skip HTTP data for performance considerations.
void SkipToSeq(uint64 seq);
void SkipToSeq(uint64_t seq);
int DataSent(double t, uint64 seq, int len, const u_char* data,
int DataSent(double t, uint64_t seq, int len, const u_char* data,
analyzer::tcp::TCP_Flags flags, bool replaying=true);
void AckReceived(uint64 seq);
void AckReceived(uint64_t seq);
// Checks if we have delivered all contents that we can possibly
// deliver for this endpoint. Calls TCP_Analyzer::EndpointEOF()
@ -73,31 +73,31 @@ public:
int HasUndeliveredData() const { return HasBlocks(); }
int HadGap() const { return had_gap; }
int DataPending() const;
uint64 DataSeq() const { return LastReassemSeq(); }
uint64_t DataSeq() const { return LastReassemSeq(); }
void DeliverBlock(uint64 seq, int len, const u_char* data);
virtual void Deliver(uint64 seq, int len, const u_char* data);
void DeliverBlock(uint64_t seq, int len, const u_char* data);
virtual void Deliver(uint64_t seq, int len, const u_char* data);
TCP_Endpoint* Endpoint() { return endp; }
const TCP_Endpoint* Endpoint() const { return endp; }
int IsOrig() const { return endp->IsOrig(); }
bool IsSkippedContents(uint64 seq, int length) const
bool IsSkippedContents(uint64_t seq, int length) const
{ return seq + length <= seq_to_skip; }
private:
TCP_Reassembler() { }
void Undelivered(uint64 up_to_seq) override;
void Gap(uint64 seq, uint64 len);
void Undelivered(uint64_t up_to_seq) override;
void Gap(uint64_t seq, uint64_t len);
void RecordToSeq(uint64 start_seq, uint64 stop_seq, BroFile* f);
void RecordToSeq(uint64_t start_seq, uint64_t stop_seq, BroFile* f);
void RecordBlock(DataBlock* b, BroFile* f);
void RecordGap(uint64 start_seq, uint64 upper_seq, BroFile* f);
void RecordGap(uint64_t start_seq, uint64_t upper_seq, BroFile* f);
void BlockInserted(DataBlock* b) override;
void Overlap(const u_char* b1, const u_char* b2, uint64 n) override;
void Overlap(const u_char* b1, const u_char* b2, uint64_t n) override;
TCP_Endpoint* endp;
@ -106,7 +106,7 @@ private:
unsigned int did_EOF:1;
unsigned int skip_deliveries:1;
uint64 seq_to_skip;
uint64_t seq_to_skip;
bool in_delivery;
analyzer::tcp::TCP_Flags flags;