[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.1beta4-123-g925aac8

[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  925aac854e687683d3b3c88cb6f5243a0fad8c50 (commit)
       via  0bafc71689b8510e9724ee565f008f16b824fe35 (commit)
       via  ebb42f831c98e2368a7d4fd03c788f718ba899e9 (commit)
       via  e85a44c383d6790e96b84c4420cc477ef4cecd98 (commit)
       via  26fc5682ad7b2f48d5db1d6c561ed1f228ed7cbc (commit)
       via  7c40c7348288d79cc97140cd63e4c9562ae12d8f (commit)
       via  1f2caf78c38525d2d58325991c11e264cdf6a278 (commit)
      from  0f1dd0d7ea46fb9a3b8d46d0da31c4af77774040 (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 925aac854e687683d3b3c88cb6f5243a0fad8c50
Author: Victor Julien <victor at inliniac.net>
Date:   Mon Jun 15 11:44:24 2015 +0200

    alproto: improve AppProtoToString
    
    Make AppProtoToString compilation fail on missing 'case's.

commit 0bafc71689b8510e9724ee565f008f16b824fe35
Author: Eric Leblond <eric at regit.org>
Date:   Tue Jun 9 15:50:31 2015 +0200

    app-layer: add modbus to AppProtoToString
    
    It was missing causing protocol identified as modbus not to be
    displayed in netflow events.

commit ebb42f831c98e2368a7d4fd03c788f718ba899e9
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Jun 10 15:22:12 2015 +0200

    suppress: add track by_either mode
    
    So far suppress rules would apply to src or dst addresses of a packet.
    This meant that if a ip would need to suppressed both as src and as dst,
    2 suppress rules would be needed.
    
    This patch introduces track by_either, which means that the ip(s) in the
    suppress rule are tested against both the packets source and dest ip's.
    If either of them is on the suppress list, the alert is suppressed.

commit e85a44c383d6790e96b84c4420cc477ef4cecd98
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Jun 10 14:20:21 2015 +0200

    suppress: support ip-lists
    
    Ticket: 1137
    
    Support supplying a list of IP's to the suppress keyword. Variables from
    the address-groups and negation is supported. The same logic (and code) is
    used that is also used in parting the IP portions of regular detection
    rules.

commit 26fc5682ad7b2f48d5db1d6c561ed1f228ed7cbc
Author: Jason Ish <ish at unx.ca>
Date:   Thu Jun 11 16:45:34 2015 -0600

    hostbits: ignore leading and trailing white space
    
    Ignore leading and trailing space around the name and
    direction tokens.

commit 7c40c7348288d79cc97140cd63e4c9562ae12d8f
Author: Jason Ish <ish at unx.ca>
Date:   Wed Jun 10 15:15:19 2015 -0600

    json-stats: reorg threads and totals
    
    Totals are now placed at the top level instead of under a "Total"
    object.
    
    Threads are placed under a "threads" object.

commit 1f2caf78c38525d2d58325991c11e264cdf6a278
Author: Jason Ish <ish at unx.ca>
Date:   Wed Jun 10 14:39:38 2015 -0600

    json-stats: log uptime in seconds, instead of a string

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

Summary of changes:
 src/app-layer-protos.c        |   6 +-
 src/app-layer-protos.h        |   3 +-
 src/detect-engine-threshold.c |  64 +++++++-----
 src/detect-hostbits.c         | 220 ++++++++++++++++++++++++++++++++++--------
 src/detect-threshold.c        |   2 +-
 src/detect-threshold.h        |   3 +-
 src/output-json-stats.c       |  40 ++++----
 src/util-threshold-config.c   |  43 +++------
 8 files changed, 262 insertions(+), 119 deletions(-)


hooks/post-receive
-- 
OISF