[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.0beta2-265-g18edec8

[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  18edec876917852e66df54836a9ebbdbe684551b (commit)
       via  91f8c33b0abbf216fe4f9a147c1824e902ed3d8e (commit)
      from  b603ad62e56ae9aa8a18409a98abc2d2042573db (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 18edec876917852e66df54836a9ebbdbe684551b
Author: Victor Julien <victor at inliniac.net>
Date:   Mon Feb 10 11:13:11 2014 +0100

    vlan: support QinQ ethernet types
    
    Add support for 802.1AD and 802.1QinQ in ethernet and vlan parsing.
    
    Tickets: #814, #1103, #1104

commit 91f8c33b0abbf216fe4f9a147c1824e902ed3d8e
Author: Victor Julien <victor at inliniac.net>
Date:   Mon Feb 10 10:57:46 2014 +0100

    defrag: fix reassembly with vlan
    
    When creating a pseudo packet with the reassembled IP packet, the
    parent's vlan id or id's are also needed. The defrag packet is run
    through decode and the flow engine, where the vlan id is necessary
    for connecting the packet to the correct flow.

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

Summary of changes:
 src/decode-ethernet.c |    1 +
 src/decode-ethernet.h |    2 ++
 src/decode-vlan.c     |    1 +
 src/decode.c          |    3 +++
 4 files changed, 7 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
OISF