[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.1beta4-116-g0f1dd0d

[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  0f1dd0d7ea46fb9a3b8d46d0da31c4af77774040 (commit)
       via  0edf28a4f80b47c53dd09a4c1344dcf2311c40ae (commit)
       via  a083513c49753242addca4d61f3896dfa43ee55b (commit)
       via  fe5a85aea0fa56c99b2f334fa7a71f8bd9c69ead (commit)
       via  928957f0a39a8ead06935b2b37e6f593659a1f09 (commit)
       via  aa6b24f81443be7e4c4184694aea2924d2fea30a (commit)
       via  ef7cd043cc285d31df7942f74aa7e4ca330db6b8 (commit)
       via  5483b800c5961d30f9e5a5cde88e8765d4405a14 (commit)
       via  8949054212ca3403de5f9aecef93eb780235d8df (commit)
      from  9fa2f85cc7f951b144c35b01d39b8bbb42348a1d (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 0f1dd0d7ea46fb9a3b8d46d0da31c4af77774040
Author: Jason Ish <ish at unx.ca>
Date:   Tue Jun 9 14:26:57 2015 -0600

    flowbits: strip leading and trailing spaces in name
    
    Redmine bug 1481. Strip leading and trailing white space. Factor
    out parsing from setup while in here.

commit 0edf28a4f80b47c53dd09a4c1344dcf2311c40ae
Author: Zachary Rasmor <zachary.r.rasmor at lmco.com>
Date:   Wed Jun 3 11:59:06 2015 -0400

    Add Feature #1454. Generic eve-log prefix support.

commit a083513c49753242addca4d61f3896dfa43ee55b
Author: Victor Julien <victor at inliniac.net>
Date:   Sat May 30 11:48:34 2015 +0200

    decode: optimize DecodeThreadVars layout
    
    Put common counters on the first cache line. Please the flow output
    pointer last as it's use depends on the flow logging being enabled
    and even then it's only called very rarely.

commit fe5a85aea0fa56c99b2f334fa7a71f8bd9c69ead
Author: Victor Julien <victor at inliniac.net>
Date:   Sat May 30 11:31:30 2015 +0200

    decode: add erspan counter

commit 928957f0a39a8ead06935b2b37e6f593659a1f09
Author: Victor Julien <victor at inliniac.net>
Date:   Wed May 20 23:01:22 2015 +0200

    decode: add ERSPANv1 decoder
    
    Only allow v1 to be parsed as thats what is tested.
    
    Take vlan_id from the ERSPAN layer.

commit aa6b24f81443be7e4c4184694aea2924d2fea30a
Author: Victor Julien <victor at inliniac.net>
Date:   Wed May 20 21:42:19 2015 +0200

    decode: clean up tunnel decode logic
    
    Don't use mix of existing and custom types to indicate the next
    layer.

commit ef7cd043cc285d31df7942f74aa7e4ca330db6b8
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Jun 9 11:50:04 2015 +0200

    detect: various header cleanups

commit 5483b800c5961d30f9e5a5cde88e8765d4405a14
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Jun 9 11:43:26 2015 +0200

    detect: remove struct/union tricks from Signature

commit 8949054212ca3403de5f9aecef93eb780235d8df
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Jun 9 10:43:06 2015 +0200

    detect: remove unused match_flags from inspect engines

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

Summary of changes:
 rules/decoder-events.rules              |   8 +-
 src/Makefile.am                         |   1 +
 src/decode-erspan.c                     |  80 ++++++++++++++++++++
 src/{packet-queue.h => decode-erspan.h} |  17 +++--
 src/decode-ethernet.h                   |   1 +
 src/decode-events.h                     |   5 ++
 src/decode-gre.c                        |  21 +++++-
 src/decode-ipv4.c                       |   2 +-
 src/decode-ipv6.c                       |   4 +-
 src/decode-teredo.c                     |   2 +-
 src/decode.c                            |  18 +++--
 src/decode.h                            |  41 +++++++----
 src/detect-engine-event.h               |   5 ++
 src/detect-engine.c                     |  61 +---------------
 src/detect-engine.h                     |   2 -
 src/detect-flowbits.c                   | 126 ++++++++++++++++++++++++++------
 src/detect-parse.c                      |   4 -
 src/detect.h                            |  64 ++++------------
 src/output-json.c                       |  36 ++++++++-
 suricata.yaml.in                        |   1 +
 20 files changed, 328 insertions(+), 171 deletions(-)
 create mode 100644 src/decode-erspan.c
 copy src/{packet-queue.h => decode-erspan.h} (75%)


hooks/post-receive
-- 
OISF