Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-09 18:18:19 +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

2
src/Reassem.cc
View file

@ -31,7 +31,7 @@ DataBlock::DataBlock(const u_char* data, uint64 size, uint64 arg_seq,
uint64 Reassembler::total_size = 0; uint64 Reassembler::total_size = 0;
Reassembler::Reassembler(int init_seq) Reassembler::Reassembler(uint64 init_seq)
{ {
blocks = last_block = 0; blocks = last_block = 0;
trim_seq = last_reassem_seq = init_seq; trim_seq = last_reassem_seq = init_seq;

2
src/Reassem.h
View file

@ -25,7 +25,7 @@ public:
class Reassembler : public BroObj { class Reassembler : public BroObj {
public: public:
Reassembler(int init_seq); Reassembler(uint64 init_seq);
virtual ~Reassembler(); virtual ~Reassembler();
void NewBlock(double t, uint64 seq, uint64 len, const u_char* data); void NewBlock(double t, uint64 seq, uint64 len, const u_char* data);

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

@ -27,7 +27,7 @@ static uint64 last_gap_bytes = 0;
TCP_Reassembler::TCP_Reassembler(analyzer::Analyzer* arg_dst_analyzer, TCP_Reassembler::TCP_Reassembler(analyzer::Analyzer* arg_dst_analyzer,
TCP_Analyzer* arg_tcp_analyzer, TCP_Analyzer* arg_tcp_analyzer,
TCP_Reassembler::Type arg_type, TCP_Reassembler::Type arg_type,
bool arg_is_orig, TCP_Endpoint* arg_endp) TCP_Endpoint* arg_endp)
: Reassembler(1) : Reassembler(1)
{ {
dst_analyzer = arg_dst_analyzer; dst_analyzer = arg_dst_analyzer;

6
src/file_analysis/FileReassembler.cc
View file

@ -7,7 +7,7 @@ namespace file_analysis {
class File; class File;
FileReassembler::FileReassembler(File *f, int starting_offset) FileReassembler::FileReassembler(File *f, uint64 starting_offset)
: Reassembler(starting_offset), the_file(f) : 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. // 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. // Not doing anything here yet.
} }

6
src/file_analysis/FileReassembler.h
View file

@ -17,7 +17,7 @@ class File;
class FileReassembler : public Reassembler { class FileReassembler : public Reassembler {
public: public:
FileReassembler(File* f, int starting_offset); FileReassembler(File* f, uint64 starting_offset);
virtual ~FileReassembler(); virtual ~FileReassembler();
void Done(); void Done();
@ -32,9 +32,9 @@ protected:
DECLARE_SERIAL(FileReassembler); DECLARE_SERIAL(FileReassembler);
void Undelivered(int up_to_seq); void Undelivered(uint64 up_to_seq);
void BlockInserted(DataBlock* b); 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 had_gap:1;
unsigned int did_EOF:1; unsigned int did_EOF:1;

1
testing/btest/Baseline/scripts.base.frameworks.file-analysis.bifs.set_timeout_interval/bro..stdout
View file

@ -15,6 +15,7 @@ SHA1: 7d99803eaf3b6e8dfa3581348bc694089579d25a
SHA256: dcb87a62a2b5d449abc138776000fd1b14edc690e9da6ea325b8f352ab033202 SHA256: dcb87a62a2b5d449abc138776000fd1b14edc690e9da6ea325b8f352ab033202
FILE_TIMEOUT FILE_TIMEOUT
FILE_TIMEOUT FILE_TIMEOUT
FILE_OVER_NEW_CONNECTION
FILE_STATE_REMOVE FILE_STATE_REMOVE
file #0, 0, 0 file #0, 0, 0
[orig_h=192.168.72.14, orig_p=3257/tcp, resp_h=65.54.95.14, resp_p=80/tcp] [orig_h=192.168.72.14, orig_p=3257/tcp, resp_h=65.54.95.14, resp_p=80/tcp]

1
testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.partial-content/b.out
View file

@ -14,6 +14,7 @@ MD5: fc13fee1d44ef737a3133f1298b21d28
SHA1: 7d99803eaf3b6e8dfa3581348bc694089579d25a SHA1: 7d99803eaf3b6e8dfa3581348bc694089579d25a
SHA256: dcb87a62a2b5d449abc138776000fd1b14edc690e9da6ea325b8f352ab033202 SHA256: dcb87a62a2b5d449abc138776000fd1b14edc690e9da6ea325b8f352ab033202
FILE_TIMEOUT FILE_TIMEOUT
FILE_OVER_NEW_CONNECTION
FILE_STATE_REMOVE FILE_STATE_REMOVE
file #0, 0, 0 file #0, 0, 0
[orig_h=192.168.72.14, orig_p=3257/tcp, resp_h=65.54.95.14, resp_p=80/tcp] [orig_h=192.168.72.14, orig_p=3257/tcp, resp_h=65.54.95.14, resp_p=80/tcp]