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

Merge remote-tracking branch 'origin/topic/seth/files-reassembly-and-mime-updates' into topic/jsiwek/file-reassembly-merge

Browse source 
Conflicts:
	testing/btest/Baseline/scripts.policy.misc.dump-events/all-events.log
This commit is contained in:
Jon Siwek 2014-12-15 10:33:09 -06:00
commit edaf7edc11
63 changed files with 1108 additions and 1081 deletions
Download patch file Download diff file Expand all files Collapse all files

4
testing/btest/scripts/base/files/extract/limit.bro
View file

@ -24,9 +24,9 @@ event file_new(f: fa_file)
[$extract_filename=efname, $extract_limit=max_extract]);
}
event file_extraction_limit(f: fa_file, args: any, limit: count, offset: count, len: count)
event file_extraction_limit(f: fa_file, args: any, limit: count, len: count)
{
print outfile, "file_extraction_limit", limit, offset, len;
print outfile, "file_extraction_limit", limit, len;
if ( double_it && ! doubled )
{