Move BroFile to zeek namespace, rename to File

This commit is contained in:
Tim Wojtulewicz 2020-07-20 12:10:58 -07:00
parent bfab224d7c
commit 910aa77d95
29 changed files with 135 additions and 115 deletions

View file

@ -48,8 +48,8 @@ public:
// from waiting_on_hole above; and is computed in a different fashion).
uint64_t NumUndeliveredBytes() const;
void SetContentsFile(BroFilePtr f);
const BroFilePtr& GetContentsFile() const { return record_contents_file; }
void SetContentsFile(zeek::FilePtr f);
const zeek::FilePtr& GetContentsFile() const { return record_contents_file; }
void MatchUndelivered(uint64_t up_to_seq, bool use_last_upper);
@ -88,9 +88,9 @@ private:
void Undelivered(uint64_t up_to_seq) override;
void Gap(uint64_t seq, uint64_t len);
void RecordToSeq(uint64_t start_seq, uint64_t stop_seq, const BroFilePtr& f);
void RecordBlock(const DataBlock& b, const BroFilePtr& f);
void RecordGap(uint64_t start_seq, uint64_t upper_seq, const BroFilePtr& f);
void RecordToSeq(uint64_t start_seq, uint64_t stop_seq, const zeek::FilePtr& f);
void RecordBlock(const DataBlock& b, const zeek::FilePtr& f);
void RecordGap(uint64_t start_seq, uint64_t upper_seq, const zeek::FilePtr& f);
void BlockInserted(DataBlockMap::const_iterator it) override;
void Overlap(const u_char* b1, const u_char* b2, uint64_t n) override;
@ -107,7 +107,7 @@ private:
bool in_delivery;
analyzer::tcp::TCP_Flags flags;
BroFilePtr record_contents_file; // file on which to reassemble contents
zeek::FilePtr record_contents_file; // file on which to reassemble contents
zeek::analyzer::Analyzer* dst_analyzer;
TCP_Analyzer* tcp_analyzer;