[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-3.0.1-330-g48771c1

Sat May 28 10:32:17 UTC 2016

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  48771c1acf2f9c87507fd3ce5559b02b4573c025 (commit)
       via  7dfdcdc770e4a99fc953c990d6a54ea7ea2112ca (commit)
       via  a8f257e05f1227771078ad797bc9b72313d70476 (commit)
       via  4a96820320e5ba8ef183d65d2802040cb8dea1d9 (commit)
       via  8b06badbcfc3f3145f6d186b628010bbd7a42027 (commit)
       via  333f2cb3107fc05859cafff7a3d1127795fbc541 (commit)
       via  eec66c7b4f7d8d3272d8229c9164f0b4c4955426 (commit)
       via  7a0dbc6f9f39d4527f4f927347196c9a757917dc (commit)
       via  d807bf4e8a837db07830c6932d162f9758c5ad81 (commit)
       via  c9d0d6f69855c3aba2ee148a092618e7d5453096 (commit)
       via  8c6deecc55117d5685e26283661640e02e7005fa (commit)
       via  88b50d2c34f49eb8bb21a7b4556808f52a8f2c97 (commit)
       via  31d8d4b0a1cf686d1271c8781c160a7e69bb932e (commit)
       via  68ddcdccde5d4d6435d405d6ebaa64041fe54583 (commit)
       via  24a1488591e67c52db7ef0ebc2c0fd020bcf9db6 (commit)
       via  a765cfde191aaa37b797d8579d523a45a9fe5895 (commit)
      from  2a5f487a16ac2390805459efad63bb556a8c0d84 (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 48771c1acf2f9c87507fd3ce5559b02b4573c025
Author: Victor Julien <victor at inliniac.net>
Date:   Sat May 28 09:21:05 2016 +0200

    debug: fix compiler warnings

commit 7dfdcdc770e4a99fc953c990d6a54ea7ea2112ca
Author: Victor Julien <victor at inliniac.net>
Date:   Fri May 27 16:46:03 2016 +0200

    thread modules: remove unused id's

commit a8f257e05f1227771078ad797bc9b72313d70476
Author: Victor Julien <victor at inliniac.net>
Date:   Fri May 27 16:39:14 2016 +0200

    detect: no longer a thread module

    Like stream, detect is now invoked directly by the FlowWorker.

commit 4a96820320e5ba8ef183d65d2802040cb8dea1d9
Author: Victor Julien <victor at inliniac.net>
Date:   Fri May 27 16:10:59 2016 +0200

    stream-tcp: more cleanups

commit 8b06badbcfc3f3145f6d186b628010bbd7a42027
Author: Victor Julien <victor at inliniac.net>
Date:   Fri May 27 16:02:06 2016 +0200

    stream-tcp: no longer register as a thread module

    Now that the FlowWorker handles the TCP Stream directly, having
    the TCP engine as a thread module is no longer needed.

    This patch removes the registration.

commit 333f2cb3107fc05859cafff7a3d1127795fbc541
Author: Victor Julien <victor at inliniac.net>
Date:   Fri May 27 14:54:36 2016 +0200

    drmemory: broader suppressions for hyperscan

commit eec66c7b4f7d8d3272d8229c9164f0b4c4955426
Author: Victor Julien <victor at inliniac.net>
Date:   Fri May 27 12:14:16 2016 +0200

    smtp: improve thread data use

    The SMTP app layer used a thread local data structure for the mpm in
    reply parsing, but it only used a pmq. The MpmThreadCtx was actually
    global. Until now this wasn't really noticed because non of the mpm's
    used the thread ctx.

    Hyperscan does use it however.

    This patch creates a new structure SMTPThreadCtx, which contains both
    the pmq and the mpm thread ctx. It's passed directly to the reply
    parsing function instead of storing a pointer to it in the SMTPState.

    Additionally fix a small memory leak warning wrt the smtp global mpm
    state.

commit 7a0dbc6f9f39d4527f4f927347196c9a757917dc
Author: Justin Viiret <justin.viiret at intel.com>
Date:   Wed May 25 11:47:24 2016 +1000

    app-layer-smtp: free mpm contexts on shutdown

    Adds a cleanup function for the SMTP parser that destroys the MPM
    context and MPM thread context it uses.

    Also marks smtp_mpm_thread_ctx static.

commit d807bf4e8a837db07830c6932d162f9758c5ad81
Author: Justin Viiret <justin.viiret at intel.com>
Date:   Mon May 23 14:22:30 2016 +1000

    detect-engine: log MPM/SPM matchers being used

commit c9d0d6f69855c3aba2ee148a092618e7d5453096
Author: Justin Viiret <justin.viiret at intel.com>
Date:   Mon May 23 10:46:53 2016 +1000

    mpm: add "auto" default for mpm-algo

    Setting mpm-algo to "auto" will use "hs" if Suricata was built against
    Hyperscan, and "ac" otherwise (or "ac-tile" on Tilera platforms).

commit 8c6deecc55117d5685e26283661640e02e7005fa
Author: Justin Viiret <justin.viiret at intel.com>
Date:   Mon May 23 13:46:24 2016 +1000

    app-layer-detect-proto: use mpm-algo

    Use the matcher configured by the user rather than hard-coding MPM_AC.

commit 88b50d2c34f49eb8bb21a7b4556808f52a8f2c97
Author: Justin Viiret <justin.viiret at intel.com>
Date:   Mon May 23 13:42:05 2016 +1000

    app-layer-detect-proto: pass mpm_ctx to DestroyCtx

    The MPM DestroyCtx function accepts the MpmCtx, not the ctx pointer
    inside it.

commit 31d8d4b0a1cf686d1271c8781c160a7e69bb932e
Author: Justin Viiret <justin.viiret at intel.com>
Date:   Mon May 23 11:58:01 2016 +1000

    detect-engine: adjust unit tests for hs mpm

    The Hyperscan MPM does match deduplication internally (using
    HS_FLAG_SINGLEMATCH) and only returns the number of unique matches,
    unlike AC.

commit 68ddcdccde5d4d6435d405d6ebaa64041fe54583
Author: Justin Viiret <justin.viiret at intel.com>
Date:   Mon May 23 11:06:39 2016 +1000

    app-layer-smtp: init mpm thread ctx after prepare

    This allows the Hyperscan MPM to correctly allocate scratch.

commit 24a1488591e67c52db7ef0ebc2c0fd020bcf9db6
Author: Justin Viiret <justin.viiret at intel.com>
Date:   Mon May 23 13:57:50 2016 +1000

    mpm-hs: make errors from hs_scan() fatal

    Hyperscan will only return an error at scan time if the database or
    scratch region are corrupted, which should provoke a fatal error.

commit a765cfde191aaa37b797d8579d523a45a9fe5895
Author: Justin Viiret <justin.viiret at intel.com>
Date:   Mon May 23 14:06:00 2016 +1000

    mpm-hs,spm-hs: don't call hs_scan() for zero bytes

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

Summary of changes:
 qa/drmemory.suppress         | 36 ++-----------------
 src/app-layer-detect-proto.c |  6 ++--
 src/app-layer-parser.c       |  2 ++
 src/app-layer-smtp.c         | 84 +++++++++++++++++++++++++++++++-------------
 src/app-layer-smtp.h         |  2 +-
 src/app-layer-ssh.c          |  2 +-
 src/detect-engine-hhd.c      |  4 +--
 src/detect-engine-hrhd.c     |  4 +--
 src/detect-engine-hrud.c     |  4 +--
 src/detect-engine-mpm.c      |  3 ++
 src/detect-engine.c          |  4 ++-
 src/detect.c                 | 36 -------------------
 src/runmode-unittests.c      |  4 +++
 src/stream-tcp.c             | 29 ---------------
 src/stream-tcp.h             |  7 ++--
 src/suricata.c               |  4 ---
 src/tm-modules.c             | 10 ------
 src/tm-threads-common.h      | 10 ------
 src/tm-threads.c             |  3 +-
 src/util-decode-mime.c       |  3 +-
 src/util-mpm-hs.c            | 11 ++++--
 src/util-mpm.h               | 12 +++++--
 src/util-profiling.c         | 13 +------
 src/util-spm-hs.c            |  4 +++
 suricata.yaml.in             | 15 ++++++--
 25 files changed, 127 insertions(+), 185 deletions(-)

hooks/post-receive
-- 
OISF