[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.0beta2-120-g3474c36

[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  3474c36b5433e12cf57b2753e4e3708d6dac6c28 (commit)
       via  f4872a2f08b64629287756b947a97c4f59aeac67 (commit)
       via  6a3621f2fe3bee73752861870f5e7be6c17f0f0f (commit)
       via  3e2205d08f6b59278be265645c955650f8923c9d (commit)
       via  5cc880c5c1f309ba48b0f6eb908cbb9c575fc851 (commit)
       via  50f5b246dbce00ef54a0771bbecc0fda56303d55 (commit)
       via  0e08f4b6fc294391ec7c774d69bc20eb16bdfae5 (commit)
       via  dfda0cd4b6de8e599c815099620b76038cb29daa (commit)
       via  258778cde491af02541ce1fcdc76ae60af6565d4 (commit)
       via  b44ec80590fc5502e734ca22a070d7683c4f1ab8 (commit)
      from  ef40fe1f31a0e7644ffe9f0154df07ff027f37f8 (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 3474c36b5433e12cf57b2753e4e3708d6dac6c28
Author: Victor Julien <victor at inliniac.net>
Date:   Mon Jan 27 14:36:15 2014 +0100

    no-detect: handle protocols that have no logger
    
    If a protocol parser is active without a logger when detection is
    disabled, the transaction handling logic would fail. Now it will
    return the proper tx id so we can clean up the complete transactions.

commit f4872a2f08b64629287756b947a97c4f59aeac67
Author: Victor Julien <victor at inliniac.net>
Date:   Mon Jan 6 15:09:21 2014 +0100

    Add --disable-detection configure option
    
    Add --disable-detection configure option to compile Suricata with
    detection disabled.

commit 6a3621f2fe3bee73752861870f5e7be6c17f0f0f
Author: Victor Julien <victor at inliniac.net>
Date:   Mon Jan 6 14:09:35 2014 +0100

    Error out if -s/-S are used with disable detect
    
    When Suricata is started with --disabled-detection, the -s and -S
    options make no sense. So error out.

commit 3e2205d08f6b59278be265645c955650f8923c9d
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Dec 17 12:59:38 2013 +0100

    detect-less: disable raw reassembly
    
    When using --disable-detection automatically disable raw stream
    reassembly by forcing stream.reassembly.raw to be false.

commit 5cc880c5c1f309ba48b0f6eb908cbb9c575fc851
Author: Victor Julien <victor at inliniac.net>
Date:   Sat Jan 11 11:14:56 2014 +0100

    detect-less: add log only TX handling function
    
    When running w/o detect, TX cleanup handling needs to ignore the
    inspect_id as it's only updated by detect.
    
    This patch introduces a new ActiveTx handler for logging only:
    AppLayerTransactionGetActiveLogOnly
    
    If --disable-detection is passed on the commandline, this function
    is registered.

commit 50f5b246dbce00ef54a0771bbecc0fda56303d55
Author: Victor Julien <victor at inliniac.net>
Date:   Mon Dec 16 17:37:09 2013 +0100

    Update main loop to handle detect-less
    
    Update main startup and shutdown loops to work will when detect
    is disabled. In this case de_ctx remains NULL.

commit 0e08f4b6fc294391ec7c774d69bc20eb16bdfae5
Author: Victor Julien <victor at inliniac.net>
Date:   Mon Dec 16 17:35:27 2013 +0100

    update runmodes to handle detect-less
    
    In runmodes setup, consider a NULL de_ctx to mean detect is disabled.

commit dfda0cd4b6de8e599c815099620b76038cb29daa
Author: Victor Julien <victor at inliniac.net>
Date:   Mon Dec 16 17:32:13 2013 +0100

    flow-time: handle detect-less case
    
    Flow timeout code keeps track of thread module running detect, and
    fails (hard) if it doesn't find it.
    
    This changeset retrieves the global g_detect_disabled and passes
    it to the timeout handling code during setup.

commit 258778cde491af02541ce1fcdc76ae60af6565d4
Author: Victor Julien <victor at inliniac.net>
Date:   Mon Dec 16 17:25:11 2013 +0100

    Introduce g_detect_disabled global
    
    This global will be set to TRUE if detect is disabled. The reason for
    adding a global is that there currently is no clean way to pass
    configuration options to management threads.

commit b44ec80590fc5502e734ca22a070d7683c4f1ab8
Author: Victor Julien <victor at inliniac.net>
Date:   Mon Dec 16 15:56:49 2013 +0100

    Add --disable-detection commandline option
    
    Flags the SuriInstance that the detection engine should be disabled.
    Actual disabling is not yet implemented.

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

Summary of changes:
 configure.ac            |    8 ++++
 src/app-layer-parser.c  |   42 +++++++++++++++++++++++-
 src/app-layer-parser.h  |    7 ++++
 src/flow-manager.c      |    4 ++-
 src/flow-timeout.c      |   49 +++++++++++++++------------
 src/flow-timeout.h      |    2 +-
 src/runmode-erf-file.c  |   24 ++++++++------
 src/runmode-pcap-file.c |   30 +++++++++++------
 src/runmode-tile.c      |   12 ++++---
 src/runmodes.c          |    3 ++
 src/suricata.c          |   82 ++++++++++++++++++++++++++++++++--------------
 src/suricata.h          |    1 +
 src/util-runmodes.c     |   78 +++++++++++++++++++++++++++++++--------------
 13 files changed, 242 insertions(+), 100 deletions(-)


hooks/post-receive
-- 
OISF