[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.0.2-95-gde4e222

[OISF Git]

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  de4e2221d8e9dc43f07c867caaad5e42f16a96b7 (commit)
       via  c85674b0a653828891e307ba5cb943e35e0340fa (commit)
       via  033ad9e97429d0f01b3601c9b3a30dae4c5d9acc (commit)
       via  a6dbf627b2e7c9d75d7ecda40e7a46357fdf88d7 (commit)
       via  2bcd48bc1200827d70c2e53982fa7901faac6176 (commit)
       via  0c1696f84bec87bcd67225a7b8655d5a0b691373 (commit)
      from  edb702a7b6a904377e35f49f6ef5e5f459e9a07a (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 de4e2221d8e9dc43f07c867caaad5e42f16a96b7
Author: Victor Julien <victor at inliniac.net>
Date:   Sat Jul 12 09:25:21 2014 +0200

    eve: add tx_id to output for alerts and events
    
    Add tx_id field for correlating alerts and events per tx.

commit c85674b0a653828891e307ba5cb943e35e0340fa
Author: sxhlinux <sxhlinux at users.noreply.github.com>
Date:   Thu Jul 24 10:00:40 2014 +0800

    Update app-layer-htp.c
    
    When keyword "boundary=" doesn't exist in the http_header, the value of r is 0 and this condition shouldn't return 0 instead 1;

commit 033ad9e97429d0f01b3601c9b3a30dae4c5d9acc
Author: Ken Steele <ken at tilera.com>
Date:   Thu Jul 3 12:42:12 2014 -0400

    Reduce reallocation in AC Tile MPM creation.
    
    Exponentially increase the memory allocated for new states when adding new
    states, then at the end resize down to the actually final size so that no space is wasted.

commit a6dbf627b2e7c9d75d7ecda40e7a46357fdf88d7
Author: Alexander Gozman <a.gozman at securitycode.ru>
Date:   Mon Jul 28 20:22:32 2014 +0400

    Add input interface's name to JSON log

commit 2bcd48bc1200827d70c2e53982fa7901faac6176
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Jul 30 11:00:53 2014 +0200

    pcap-log: yaml comment update

commit 0c1696f84bec87bcd67225a7b8655d5a0b691373
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Jul 30 10:58:30 2014 +0200

    pcap-log: unify lock handling, fixes Coverity warn
    
    *** CID 1229124:  Data race condition  (MISSING_LOCK)
    /src/log-pcap.c: 363 in PcapLog()
    357         {
    358             return TM_ECODE_OK;
    359         }
    360
    361         PcapLogLock(pl);
    362
    >>>     CID 1229124:  Data race condition  (MISSING_LOCK)
    >>>     Accessing "pl->pkt_cnt" without holding lock "PcapLogData_.plog_lock". Elsewhere, "PcapLogData_.pkt_cnt" is accessed with "PcapLogData_.plog_lock" held 1 out of 2 times (1 of these accesses strongly imply that it is necessary).
    363         pl->pkt_cnt++;
    364         pl->h->ts.tv_sec = p->ts.tv_sec;
    365         pl->h->ts.tv_usec = p->ts.tv_usec;
    366         pl->h->caplen = GET_PKT_LEN(p);
    367         pl->h->len = GET_PKT_LEN(p);
    368         len = sizeof(*pl->h) + GET_PKT_LEN(p);

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

Summary of changes:
 src/app-layer-htp.c     |    3 ++-
 src/log-pcap.c          |    4 ++--
 src/output-json-alert.c |    3 +++
 src/output-json-dns.c   |   13 +++++++----
 src/output-json-file.c  |    1 +
 src/output-json-http.c  |    7 ++++--
 src/output-json.c       |    6 ++++++
 src/util-mpm-ac-tile.c  |   55 +++++++++++++++++++++++++++++++----------------
 src/util-mpm-ac-tile.h  |    2 ++
 suricata.yaml.in        |    2 +-
 10 files changed, 67 insertions(+), 29 deletions(-)


hooks/post-receive
-- 
OISF