[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.0-39-g26778b8

Thu Apr 10 10:21:16 UTC 2014

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  26778b8703a34ce5065395a307c582dbbc7cb152 (commit)
       via  c27304451e30c67b6b370974c89948ab7e115b51 (commit)
       via  b2d29a85e90770a155763034e9873bd368b58fe3 (commit)
       via  34069054ce53adab5dc32747c31fb0a9e57682ca (commit)
       via  bc1c06b9e4ab7687bcc269e52d0940cb730b53e2 (commit)
       via  90c4834709f6ca95d84428fb73460f37f0cbb787 (commit)
       via  3a6be9772f73f160bd0292fa5490de4511ba461f (commit)
       via  7ffd22713352d6c4b9bb019159f20fbbc3b436e1 (commit)
       via  7ee3b456a3fa52ae0ec194f4fea2e3e40348979a (commit)
       via  1f2310bb342c5f1a6f28ecaca18ebf9707fc6c15 (commit)
       via  f62185c207c7c257ce9d95198bf92ebc6e24f407 (commit)
       via  f96a54535c2b063404f865e6f16a9c6a5b976c8e (commit)
       via  9df045d086f9399eee25f63886c9fdaf84f10f66 (commit)
       via  4a104ae3154df3419107c2b46697432257b2c370 (commit)
       via  9961520316bccaeee448dd20dae53496fa322d27 (commit)
      from  d476c654eea7cfa47c31f1d0a9901c1759c2da5e (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 26778b8703a34ce5065395a307c582dbbc7cb152
Author: Victor Julien <victor at inliniac.net>
Date:   Thu Apr 10 09:45:21 2014 +0200

    output-api: cleanup handling

    Add output 'free list' that contains all the output ctx' that need
    cleanup at shutdown. It differs from the runmode output list in that
    it will also contain a 'parent' for the submodules that share the
    context of it's parent.

commit c27304451e30c67b6b370974c89948ab7e115b51
Author: Victor Julien <victor at inliniac.net>
Date:   Thu Apr 10 09:43:50 2014 +0200

    output api: complete shutdown functions

    Add missing function for Filedata API. Clean up list in all functions.

commit b2d29a85e90770a155763034e9873bd368b58fe3
Author: Victor Julien <victor at inliniac.net>
Date:   Thu Apr 10 09:41:52 2014 +0200

    tls-json: add cleanup function

    Properly clean up output context when shutting down.

commit 34069054ce53adab5dc32747c31fb0a9e57682ca
Author: Victor Julien <victor at inliniac.net>
Date:   Thu Apr 10 09:40:42 2014 +0200

    drop-json: fix cleanup

    Use proper function for sub-module cleanup. LogFileCtx is not managed
    by the sub-module, so don't clean it.

commit bc1c06b9e4ab7687bcc269e52d0940cb730b53e2
Author: Victor Julien <victor at inliniac.net>
Date:   Thu Apr 10 09:36:19 2014 +0200

    eve-log: fix mem leak at shutdown

    Make sure we free all memory in the shutdown function.

commit 90c4834709f6ca95d84428fb73460f37f0cbb787
Author: Victor Julien <victor at inliniac.net>
Date:   Thu Apr 10 09:08:53 2014 +0200

    ssh-json: add clean up functions

    Add clean up functions for the SSH json logger.

commit 3a6be9772f73f160bd0292fa5490de4511ba461f
Author: Victor Julien <victor at inliniac.net>
Date:   Thu Apr 10 08:35:51 2014 +0200

    http-json: add missing cleanup functions

    Add cleanup functions.

commit 7ffd22713352d6c4b9bb019159f20fbbc3b436e1
Author: Victor Julien <victor at inliniac.net>
Date:   Thu Apr 10 08:27:10 2014 +0200

    file-json: cleanup at shutdown

    Fix a memory leak at shutdown. Module didn't have a cleanup function.

commit 7ee3b456a3fa52ae0ec194f4fea2e3e40348979a
Author: Victor Julien <victor at inliniac.net>
Date:   Thu Apr 10 08:25:22 2014 +0200

    dns-json: fix cleanup

    Use specialized cleanup function for sub-module case. Freeing the
    LogFileCtx is not the responsibility of a sub-module.

commit 1f2310bb342c5f1a6f28ecaca18ebf9707fc6c15
Author: Victor Julien <victor at inliniac.net>
Date:   Thu Apr 10 08:24:08 2014 +0200

    alert-json: fix cleanup

    Call specialized clean up function when running as a sub-module.

commit f62185c207c7c257ce9d95198bf92ebc6e24f407
Author: Victor Julien <victor at inliniac.net>
Date:   Thu Apr 10 08:20:57 2014 +0200

    log-tls: run Disable at shutdown

    Call OutputTlsLoggerDisable at cleanup.

commit f96a54535c2b063404f865e6f16a9c6a5b976c8e
Author: Victor Julien <victor at inliniac.net>
Date:   Thu Apr 10 08:19:06 2014 +0200

    drop loggers: call disable func

    Call OutputDropLoggerDisable() on cleanup.

commit 9df045d086f9399eee25f63886c9fdaf84f10f66
Author: Victor Julien <victor at inliniac.net>
Date:   Thu Apr 10 08:13:38 2014 +0200

    output: add Disable funcs to mirror Enable

    For the loggers that we allow only one instance for: tls, ssh, drop, we
    track active loggers through Output*Enable functions. Add Disable
    functions to mirror this. They are to be called from the shutdown funcs
    those loggers use.

commit 4a104ae3154df3419107c2b46697432257b2c370
Author: Victor Julien <victor at inliniac.net>
Date:   Thu Apr 10 08:11:34 2014 +0200

    unified2: fix memory leak at shutdown

    Module didn't properly free output context at shutdown. Led to a leak
    in Unix Socket mode.

commit 9961520316bccaeee448dd20dae53496fa322d27
Author: Eric Leblond <eric at regit.org>
Date:   Wed Apr 9 15:04:45 2014 +0200

    output: clean file desc at exit.

    This is a beginning of implementation for bug #1660:
     https://redmine.openinfosecfoundation.org/issues/1160

    This patch adds a cleaning function for each logger of new type
    (packet, tx and file). These functions are called in RunModeShutDown().

    The state of this patch is that it is crashing suricata when sending
    pcap to analyse:
     - At first pcap if tx and file cleaning function are called
     - At second pcap if only packet cleaning function is called

    The cause in first case is unknown. In second case this is due to
    the necessity of cleaning the list of logger registered to a logging
    type.

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

Summary of changes:
 src/alert-unified2-alert.c |    1 +
 src/log-droplog.c          |    2 ++
 src/log-tlslog.c           |    2 ++
 src/output-file.c          |   16 ++++++++++-
 src/output-file.h          |    2 ++
 src/output-filedata.c      |   16 ++++++++++-
 src/output-filedata.h      |    2 ++
 src/output-json-alert.c    |    9 +++++-
 src/output-json-dns.c      |   10 ++++++-
 src/output-json-drop.c     |   12 +++++++-
 src/output-json-file.c     |    7 +++++
 src/output-json-http.c     |   20 ++++++++++++--
 src/output-json-ssh.c      |   23 ++++++++++++++--
 src/output-json-tls.c      |   23 ++++++++++++++--
 src/output-json.c          |    2 ++
 src/output-packet.c        |   18 +++++++++++-
 src/output-packet.h        |    2 ++
 src/output-tx.c            |   15 +++++++++-
 src/output-tx.h            |    2 ++
 src/output.c               |   15 ++++++++++
 src/output.h               |    5 ++++
 src/runmodes.c             |   65 ++++++++++++++++++++++++++++++++++++++++++--
 22 files changed, 254 insertions(+), 15 deletions(-)

hooks/post-receive
-- 
OISF