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

Merge remote-tracking branch 'origin/topic/seth/files-tracking' into topic/seth/files-tracking

Browse source 
Conflicts:
	src/Reassem.cc
	src/Reassem.h
	src/analyzer/protocol/tcp/TCP_Reassembler.cc
This commit is contained in:
Seth Hall 2014-05-27 10:59:43 -04:00
commit 8d72cd20a8
7 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/file_analysis/FileReassembler.cc
View file

@ -7,7 +7,7 @@ namespace file_analysis {
class File;
FileReassembler::FileReassembler(File *f, int starting_offset)
FileReassembler::FileReassembler(File *f, uint64 starting_offset)
: Reassembler(starting_offset), the_file(f)
{
}
@ -35,12 +35,12 @@ void FileReassembler::BlockInserted(DataBlock* start_block)
}
}
void FileReassembler::Undelivered(int up_to_seq)
void FileReassembler::Undelivered(uint64 up_to_seq)
{
// Not doing anything here yet.
}
void FileReassembler::Overlap(const u_char* b1, const u_char* b2, int n)
void FileReassembler::Overlap(const u_char* b1, const u_char* b2, uint64 n)
{
// Not doing anything here yet.
}

6
src/file_analysis/FileReassembler.h
View file

@ -17,7 +17,7 @@ class File;
class FileReassembler : public Reassembler {
public:
FileReassembler(File* f, int starting_offset);
FileReassembler(File* f, uint64 starting_offset);
virtual ~FileReassembler();
void Done();
@ -32,9 +32,9 @@ protected:
DECLARE_SERIAL(FileReassembler);
void Undelivered(int up_to_seq);
void Undelivered(uint64 up_to_seq);
void BlockInserted(DataBlock* b);
void Overlap(const u_char* b1, const u_char* b2, int n);
void Overlap(const u_char* b1, const u_char* b2, uint64 n);
unsigned int had_gap:1;
unsigned int did_EOF:1;