[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.0beta1-267-g1d18155

[noreply at openinfosecfoundation.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OISF".

The branch, master has been updated
       via  1d18155a169418e129ffad1dbb2a764a98fd41e3 (commit)
       via  e7df53b1360726c19619bbf0a5156ede06670174 (commit)
       via  edeeb7ed443eac90ba59519cc43f1ec16e5773a0 (commit)
      from  51c2e1eaf6026e99b0b236d51171b5fbd1e09d04 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1d18155a169418e129ffad1dbb2a764a98fd41e3
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Sep 18 15:09:38 2013 +0200

    XFF: use per alert tx id
    
    Use the tx id stored for each alert to find the correct XFF address
    to add to the extra-data field.
    
    In overwrite mode we still only grab the first available XFF addr,
    as this address is set in the header preceeding the individual alerts.
    
    Issue #904.

commit e7df53b1360726c19619bbf0a5156ede06670174
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Sep 18 12:33:00 2013 +0200

    Display TX id in alert debuglog.

commit edeeb7ed443eac90ba59519cc43f1ec16e5773a0
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Sep 18 10:18:09 2013 +0200

    Store TX id with alerts
    
    When generating an alert and storing it in the packet, store the tx_id
    as well. This way the output modules can log the tx_id and access the
    proper tx for logging.
    
    Issue #904.

-----------------------------------------------------------------------

Summary of changes:
 src/alert-debuglog.c       |    7 ++
 src/alert-unified2-alert.c |  189 ++++++++++++++++++++++++++++----------------
 src/decode.h               |    3 +
 src/detect-engine-alert.c  |    4 +-
 src/detect-engine-alert.h  |    2 +-
 src/detect-engine-iponly.c |    4 +-
 src/detect-engine-state.c  |   52 ++++++++++--
 src/detect-engine-state.h  |    2 +-
 src/detect.c               |   26 +++---
 9 files changed, 197 insertions(+), 92 deletions(-)


hooks/post-receive
-- 
OISF