Permalink
Browse files

Merge commit 'upstream/master'

  • Loading branch information...
2 parents 9e2badc + 31d84e4 commit dc6fd9ecf68a500b9be35667a993e46a6aa03f70 @JustinAzoff committed Mar 12, 2010
Showing with 6 additions and 3 deletions.
  1. +4 −2 smtp-ext.bro
  2. +2 −1 software-ext.bro
View
@@ -146,13 +146,15 @@ function end_smtp_extended_logging(c: connection)
}
}
+ # FIXME: I'm seeing crashes from this. We'll delay and just use the
+ # last element of the vector for the software event for now.
# reverse the "received from" path
- sort(conn_log$path, function(a:addr, b:addr):int { return -1; });
+ #sort(conn_log$path, function(a:addr, b:addr):int { return -1; });
# if the MUA provided a user-agent string, raise the software event.
if ( conn_log$agent != "" )
{
local s = default_software_parsing(conn_log$agent);
- event software_version_found(c, conn_log$path[1], s, "MUA");
+ event software_version_found(c, conn_log$path[|conn_log$path|], s, "MUA");
}
# Throw the event for other scripts to handle
View
@@ -45,7 +45,8 @@ event bro_init()
LOG::create_logs("software-ext", logging, split_log_file, T);
LOG::define_header("software-ext", cat_sep("\t", "\\N",
"ts", "host",
- "software", "version"));
+ "software", "version",
+ "description"));
}
# Compare two versions.

0 comments on commit dc6fd9e

Please sign in to comment.