[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-3.2.1-193-g3ca1a29

[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  3ca1a29bbd6cfe05f20a9d9717be7b98214a3591 (commit)
       via  7b1dae625121a2bbfb72054e8bc1aba102356e69 (commit)
       via  365aa1f3e5a149e74ef4cd18f3c755dea68f9a92 (commit)
       via  3b233876640afa8efa9a2a2798535f256d63ed4d (commit)
       via  005a700e543b65db510243814d85f432cc0912d6 (commit)
      from  63078909d5d279bdff465a98a6ab0a52e6467694 (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 3ca1a29bbd6cfe05f20a9d9717be7b98214a3591
Author: Jason Ish <ish at unx.ca>
Date:   Mon Mar 20 10:54:51 2017 -0600

    defrag: fix argument used in macro to match signature
    
    "p" was being used in the macro but was not an argument to
    the macro, but it worked due to the context of the macro.
    
    Use the actual macro argument, d2, instead of p.
    
    Results in no change to generated code.

commit 7b1dae625121a2bbfb72054e8bc1aba102356e69
Author: Mats Klepsland <mats.klepsland at gmail.com>
Date:   Fri Mar 10 07:23:30 2017 +0100

    doc: add documentation for Lua SCFlowTimestamps

commit 365aa1f3e5a149e74ef4cd18f3c755dea68f9a92
Author: Mats Klepsland <mats.klepsland at gmail.com>
Date:   Fri Mar 10 07:07:09 2017 +0100

    lua: add SCFlowTimestamps function
    
    Add SCFlowTimestamps() to return startts and lastts as seconds and
    microseconds from flow.
    
    Examples:
    
      startts, lastts = SCFlowTimestamps()
      startts_s, lastts_s, startts_us, lastts_us = SCFlowTimestamps()

commit 3b233876640afa8efa9a2a2798535f256d63ed4d
Author: Mats Klepsland <mats.klepsland at gmail.com>
Date:   Wed Feb 22 07:54:26 2017 +0100

    doc: add documentation for eve-log file permissions

commit 005a700e543b65db510243814d85f432cc0912d6
Author: Mats Klepsland <mats.klepsland at gmail.com>
Date:   Tue Feb 21 10:41:57 2017 +0100

    logging: support custom file permissions
    
    Support setting file permissions per logger using 'filemode', e.g.:
    
      outputs:
        - eve-log:
            enabled: yes
            filetype: regular
            filename: eve.json
            filemode: 660

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

Summary of changes:
 doc/userguide/output/eve/eve-json-output.rst | 17 +++++++++++++
 doc/userguide/output/lua-output.rst          | 11 ++++++++
 src/defrag-hash.c                            |  2 +-
 src/util-error.c                             |  1 +
 src/util-error.h                             |  1 +
 src/util-logopenfile.c                       | 28 +++++++++++++++++---
 src/util-logopenfile.h                       |  3 +++
 src/util-lua-common.c                        | 38 ++++++++++++++++++++++++++++
 8 files changed, 96 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
OISF