[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.0beta1-13-gfb16cf1

[noreply at openinfosecfoundation.org]

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  fb16cf1a5a1173793311096b91ce1b6f9995b3f8 (commit)
       via  16c3487444adf9b888a499604735c1254a669795 (commit)
       via  58ed1f241114c293d7cb5d7be69d6748ff7f6205 (commit)
      from  055b422c28c753d067b06862149d6d0225318c8c (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 fb16cf1a5a1173793311096b91ce1b6f9995b3f8
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Jul 24 11:54:08 2013 +0200

    vlan: add rule for new 'too many layers' event

commit 16c3487444adf9b888a499604735c1254a669795
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Jul 23 13:23:08 2013 +0200

    Add yaml option to disable vlan ids hashing
    
    In some cases using the vlan id(s) in flow hashing is problematic. Cases
    of broken routers have been reported. So this option allows for disabling
    the use of vlan id(s) while calculating the flow hash, and in the future
    other hashes.
    
    Vlan tracking for flow is enabled by default.

commit 58ed1f241114c293d7cb5d7be69d6748ff7f6205
Author: Victor Julien <victor at inliniac.net>
Date:   Thu Oct 11 20:35:17 2012 +0200

    flow: take vlan_id's into account in the flow hash
    
    In VLAN we can have 2 layers of encapsulation. In this patch both
    layers are used in the flow hash to distinguish between encapsulated
    traffic.

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

Summary of changes:
 rules/decoder-events.rules |    5 ++++-
 src/decode-events.h        |    1 +
 src/decode-vlan.c          |   34 +++++++++++++++++++++++++++-------
 src/decode.c               |    7 +++++++
 src/decode.h               |   13 +++++++++++--
 src/detect-engine-event.h  |    1 +
 src/flow-hash.c            |   34 +++++++++++++++++++++++++---------
 src/flow-util.c            |    2 ++
 src/flow.h                 |    1 +
 suricata.yaml.in           |    7 +++++++
 10 files changed, 86 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
OISF