[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-3.2-66-gf738062

[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  f73806211a93f40873d08d865c51fba3e3d11ce9 (commit)
       via  1abaf1c96d7e2a49f7d3645e48f9ab83868547c7 (commit)
       via  a18af7325f7d64f983cb9a2110f87e0c937b050a (commit)
       via  edbb035160a2090dd0e3e8fbba55449609bbae9f (commit)
       via  a2659ed7ec648ae2fe269335a76766852e915076 (commit)
       via  c531e8f77cfcbe91b353ece306143439613f27cf (commit)
       via  d9b87e502d78497fd0e311724aff78c5bfa45d31 (commit)
       via  569cc5d238639c27a88a94069bf28d8f60809f03 (commit)
       via  a098896b285bde587db122baf0a3f6256f89d0a8 (commit)
       via  fbc2dbac288f42f1c68e8fb4d9de15541568d9d7 (commit)
      from  187a6f392c51eb8e07a1d997fff53adabe30f6d7 (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 f73806211a93f40873d08d865c51fba3e3d11ce9
Author: Jason Ish <ish at unx.ca>
Date:   Thu Jan 19 09:28:45 2017 -0600

    template script: use bash and require ed
    
    For now these scripts only work in bash, and the "ed" program
    is required.

commit 1abaf1c96d7e2a49f7d3645e48f9ab83868547c7
Author: Jason Ish <ish at unx.ca>
Date:   Fri Nov 18 10:53:25 2016 -0600

    templates: require the protocol name to start with a capital
    
    When running ./setup-app-layer.sh require the protocol name to
    start with a capital letter so it looks somewhat like a proper
    name. This will help give better function names.
    
    For example:
    
       ./setup-app-layer.sh IRC
       ./setup-app-layer.sh Irc
    
    will create function names starting with IRC or Irc. But we do
    not want function names to start with "irc".

commit a18af7325f7d64f983cb9a2110f87e0c937b050a
Author: Andreas Herz <andi at geekosphere.org>
Date:   Thu Jan 19 23:48:59 2017 +0100

    configure: prevent combination of unittests and debug-validation

commit edbb035160a2090dd0e3e8fbba55449609bbae9f
Author: Mats Klepsland <mats.klepsland at gmail.com>
Date:   Fri Jan 13 11:50:35 2017 +0100

    doc: add documentation for Lua SCFlowHasAlerts

commit a2659ed7ec648ae2fe269335a76766852e915076
Author: Mats Klepsland <mats.klepsland at gmail.com>
Date:   Fri Jan 13 11:46:59 2017 +0100

    output-json-flow: add has_alerts field
    
    Add has_alerts field to flow eve-log to indicate if a flow has
    any alerts or not.

commit c531e8f77cfcbe91b353ece306143439613f27cf
Author: Mats Klepsland <mats.klepsland at gmail.com>
Date:   Fri Jan 13 11:08:55 2017 +0100

    lua: add SCFlowHasAlerts function
    
    Add SCFlowHasAlerts() to check if a flow has alerts. Returns true
    on alerts, false otherwise.
    
    Example:
    
      has_alerts = SCFlowHasAlerts()
      if has_alerts then
        -- do something
      end

commit d9b87e502d78497fd0e311724aff78c5bfa45d31
Author: Mats Klepsland <mats.klepsland at gmail.com>
Date:   Fri Jan 13 11:03:55 2017 +0100

    flow: set flag to indicate that a flow has alerts
    
    Set FLOW_HAS_ALERTS flag on the flow on alerts. Add FlowHasAlerts(..)
    and FlowSetHasAlertsFlag(..) to check and set this flag.

commit 569cc5d238639c27a88a94069bf28d8f60809f03
Author: Eric Leblond <eric at regit.org>
Date:   Thu Jan 19 10:52:41 2017 -0800

    util-file: introduce new functions for file size
    
    This patch introduces the FileDataSize and FileTrackedSize functions.
    The first one is just a renaming of the initial FilSize function
    whereas the other one is using the newly introduced size field as
    value.

commit a098896b285bde587db122baf0a3f6256f89d0a8
Author: Eric Leblond <eric at regit.org>
Date:   Wed Jan 18 11:09:29 2017 -0800

    output-json-file: use size instead of FileSize
    
    FileSize is not returning the actual value when file store is not
    used.

commit fbc2dbac288f42f1c68e8fb4d9de15541568d9d7
Author: Eric Leblond <eric at regit.org>
Date:   Wed Jan 18 11:08:21 2017 -0800

    util-file: change file size computation
    
    The file size returned by FileSize is invalid if file store is not
    used so we introduce a new size field in File structure that is used
    to store the size.

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

Summary of changes:
 configure.ac                        |  6 +++++-
 doc/userguide/output/lua-output.rst | 16 ++++++++++++++++
 scripts/setup-app-layer-detect.sh   |  2 +-
 scripts/setup-app-layer-logger.sh   |  2 +-
 scripts/setup-app-layer.sh          | 31 ++++++++++++++++++++++++++-----
 src/app-layer-htp-file.c            |  4 ++--
 src/app-layer-smtp.c                |  8 ++++----
 src/detect-engine-alert.c           |  6 ++++++
 src/detect-engine-file.c            |  2 +-
 src/detect-engine-filedata-smtp.c   |  4 ++--
 src/detect-filemagic.c              |  8 ++++----
 src/detect-filesize.c               |  2 +-
 src/flow.c                          | 24 ++++++++++++++++++++++++
 src/flow.h                          |  5 ++++-
 src/log-file.c                      |  2 +-
 src/log-filestore.c                 |  2 +-
 src/output-filedata.c               |  2 +-
 src/output-json-file.c              |  2 +-
 src/output-json-flow.c              |  2 ++
 src/util-file.c                     | 34 ++++++++++++++++++++++++++--------
 src/util-file.h                     |  4 +++-
 src/util-lua-common.c               | 35 ++++++++++++++++++++++++++++++++++-
 22 files changed, 166 insertions(+), 37 deletions(-)


hooks/post-receive
-- 
OISF