Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-08 09:38:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

FileAnalysis: separating IRC/FTP data analyzers.

Browse source 
It simplifies the file handle string callbacks.
This commit is contained in:
Jon Siwek 2013-03-20 11:12:06 -05:00
parent 59ed5c75f1
commit 661677d452
37 changed files with 156 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,10 +2,11 @@
@load base/utils/conn-ids
@load base/frameworks/file-analysis/main
redef FileAnalysis::service_handle_callbacks += {
["ftp-data"] = function(c: connection, is_orig: bool): string
redef FileAnalysis::handle_callbacks += {
[ANALYZER_FTP_DATA] = function(c: connection, is_orig: bool): string
{
if ( is_orig ) return "";
return fmt("%s ftp-data: %s", c$start_time, id_string(c$id));
return fmt("%s %s %s", ANALYZER_FTP_DATA, c$start_time,
id_string(c$id));
},
};

6
scripts/base/protocols/ftp/main.bro
View file

@ -228,7 +228,8 @@ event ftp_request(c: connection, command: string, arg: string) &priority=5
{
c$ftp$passive=F;
ftp_data_expected[data$h, data$p] = c$ftp;
expect_connection(id$resp_h, data$h, data$p, ANALYZER_FILE, 5mins);
expect_connection(id$resp_h, data$h, data$p, ANALYZER_FTP_DATA,
5mins);
}
else
{
@ -281,7 +282,8 @@ event ftp_reply(c: connection, code: count, msg: string, cont_resp: bool) &prior
data$h = id$resp_h;
ftp_data_expected[data$h, data$p] = c$ftp;
expect_connection(id$orig_h, data$h, data$p, ANALYZER_FILE, 5mins);
expect_connection(id$orig_h, data$h, data$p, ANALYZER_FTP_DATA,
5mins);
}
else
{