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

Revert "FileAnalysis: optimize get_file_handle event queueing."

Browse source 
This reverts commit fc267d010d.

There were some diffs caused by this in external test suites I'm
unsure about, I'm going to go over optimizations more closely in
a different branch.
This commit is contained in:
Jon Siwek 2013-04-03 09:49:39 -05:00
parent fc267d010d
commit 393d35dc60
10 changed files with 37 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

9
scripts/base/protocols/ftp/file-analysis.bro
View file

@ -18,6 +18,9 @@ export {
local info: FTP::Info = ftp_data_expected[c$id$resp_h, c$id$resp_p];
local rval = fmt("%s %s %s", ANALYZER_FTP_DATA, c$start_time,
id_string(c$id));
if ( info$passive )
# FTP client initiates data channel.
if ( is_orig )
@ -25,14 +28,12 @@ export {
return "";
else
# Do care about FTP server data.
return cat(ANALYZER_FTP_DATA, " ", c$start_time, " ",
id_string(c$id));
return rval;
else
# FTP server initiates dta channel.
if ( is_orig )
# Do care about FTP server data.
return cat(ANALYZER_FTP_DATA, " ", c$start_time, " ",
id_string(c$id));
return rval;
else
# Don't care about FTP client data.
return "";

8
scripts/base/protocols/http/file-analysis.bro
View file

@ -18,11 +18,11 @@ export {
if ( ! c?$http ) return "";
if ( c$http$range_request )
return cat(ANALYZER_HTTP, " ", is_orig, " ", c$id$orig_h,
" ", build_url(c$http));
return fmt("%s %s %s %s", ANALYZER_HTTP, is_orig, c$id$orig_h,
build_url(c$http));
return cat(ANALYZER_HTTP, " ", c$start_time, " ", is_orig,
" ", c$http$trans_depth, " ", id_string(c$id));
return fmt("%s %s %s %s %s", ANALYZER_HTTP, c$start_time, is_orig,
c$http$trans_depth, id_string(c$id));
}
}

2
scripts/base/protocols/irc/file-analysis.bro
View file

@ -15,7 +15,7 @@ export {
function get_file_handle(c: connection, is_orig: bool): string
{
if ( is_orig ) return "";
return cat(ANALYZER_IRC_DATA, " ", c$start_time, " ",
return fmt("%s %s %s", ANALYZER_IRC_DATA, c$start_time,
id_string(c$id));
}
}

4
scripts/base/protocols/smtp/file-analysis.bro
View file

@ -17,8 +17,8 @@ export {
{
if ( ! c?$smtp ) return "";
return cat(ANALYZER_SMTP, " ", c$start_time, " ",
c$smtp$trans_depth, " ", c$smtp_state$mime_level);
return fmt("%s %s %s %s", ANALYZER_SMTP, c$start_time,
c$smtp$trans_depth, c$smtp_state$mime_level);
}
}