Fixing a bug with handling downgrade from weird conn to orig.

This commit is contained in:
Seth Hall 2011-10-22 01:13:15 -04:00
parent 29bace02b2
commit ff51068598

View file

@ -286,8 +286,8 @@ function report(t: time, name: string, identifier: string, have_conn: bool, addl
if ( action in notice_actions ) if ( action in notice_actions )
{ {
# Handle notices # Handle notices
if ( action == ACTION_NOTICE_PER_ORIG && have_conn ) if ( have_conn && action == ACTION_NOTICE_PER_ORIG )
identifier = flow_id_string(current_conn$id$orig_h, current_conn$id$resp_h); identifier = fmt("%s", current_conn$id$orig_h);
else if ( action == ACTION_NOTICE_ONCE ) else if ( action == ACTION_NOTICE_ONCE )
identifier = ""; identifier = "";
@ -299,8 +299,8 @@ function report(t: time, name: string, identifier: string, have_conn: bool, addl
else else
{ {
# Handle logging. # Handle logging.
if ( action == ACTION_LOG_PER_ORIG && have_conn ) if ( have_conn && action == ACTION_LOG_PER_ORIG )
identifier = flow_id_string(current_conn$id$orig_h, current_conn$id$resp_h); identifier = fmt("%s", current_conn$id$orig_h);
else if ( action == ACTION_LOG_ONCE ) else if ( action == ACTION_LOG_ONCE )
identifier = ""; identifier = "";