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

Final notice email tuning.

Browse source
This commit is contained in:
Seth Hall 2011-10-21 23:08:56 -04:00
parent 0e79ec46b6
commit 7746f5b223
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
scripts/base/frameworks/notice/main.bro
View file

@ -353,11 +353,12 @@ function email_notice_to(n: Notice::Info, dest: string, extend: bool)
return; return;
local email_text = email_headers(fmt("%s", n$note), dest); local email_text = email_headers(fmt("%s", n$note), dest);
# First off, finish the headers and include the human readable message
# then leave a blank line after the message.
email_text = string_cat(email_text, "\nMessage: ", n$msg, "\n\n");
# Finish off the headers and start the message body. # Next, add information about the connection if it exists.
email_text = string_cat(email_text, "\n");
# First off, add information about the connection if it exists.
if ( n?$id ) if ( n?$id )
{ {
email_text = string_cat(email_text, "Connection: ", email_text = string_cat(email_text, "Connection: ",
@ -369,9 +370,6 @@ function email_notice_to(n: Notice::Info, dest: string, extend: bool)
else if ( n?$src ) else if ( n?$src )
email_text = string_cat(email_text, "Address: ", fmt("%s", n$src), "\n"); email_text = string_cat(email_text, "Address: ", fmt("%s", n$src), "\n");
# Any connection information is followed up by the human readable message.
email_text = string_cat(email_text, "Message: ", n$msg, "\n");
# Add the extended information if it's requested. # Add the extended information if it's requested.
if ( extend ) if ( extend )
{ {