[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.0beta1-388-g277fb61

[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  277fb61c1d991d84730d253c0fc0274c3f81a7ee (commit)
       via  3fdf52239d611c0d436934e3adf99544ba686419 (commit)
       via  c611b258a50cb2bbca4abf346d5eccc671e3a3b0 (commit)
       via  d4b7ecfbe3f33ce1ea502000b6103e99267c0a28 (commit)
      from  0b0e9340dcd23c22009c94cbbedcf46270e5d135 (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 277fb61c1d991d84730d253c0fc0274c3f81a7ee
Author: Victor Julien <victor at inliniac.net>
Date:   Thu Nov 28 19:20:34 2013 +0100

    defrag: clean up
    
    Rename PacketDefragPktFinishSetup to PacketDefragPktSetupParent to
    better refect it's function.

commit 3fdf52239d611c0d436934e3adf99544ba686419
Author: Eric Leblond <eric at regit.org>
Date:   Thu Nov 28 17:36:03 2013 +0100

    defrag: don't modify packet if defrag fails
    
    If defrag fails dur to an invalid decoding, we are not modifying
    the origin packet anymore.

commit c611b258a50cb2bbca4abf346d5eccc671e3a3b0
Author: Eric Leblond <eric at regit.org>
Date:   Thu Nov 28 15:23:21 2013 +0100

    decode: PacketTunnelPktSetup replaces PacketPseudoPktSetup
    
    This patch replaces PacketPseudoPktSetup by a better named
    PacketTunnelPktSetup function which is also in charge of doing
    the decoding of the tunneled packet.
    This allow to clean the code. But it also fixes an issue.
    Previously, if the DecodeTunnel function was failling (cause of
    an invalid packet mainly), the result was that the original packet
    to be considered as a tunnel packet (and not inspected by payload
    detection).

commit d4b7ecfbe3f33ce1ea502000b6103e99267c0a28
Author: Eric Leblond <eric at regit.org>
Date:   Wed Nov 27 18:53:52 2013 +0100

    decode: update API to return error
    
    In some cases, the decoding is not possible and some really invalid
    packet can be created. This is in particular the case of tunnel. In
    that case, it is more interesting to forget about the tunneled
    packet and only consider the original packet.
    
    DecodeTunnel function is maked as warn_unused_result because it is
    meaningful for the decoder to know if the underlying data were not
    correct. And in this case, only focus detection on the content.

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

Summary of changes:
 src/decode-ethernet.c  |    8 ++--
 src/decode-gre.c       |   62 +++++++++++++++--------------------
 src/decode-icmpv4.c    |    6 ++--
 src/decode-icmpv6.c    |    6 ++--
 src/decode-ipv4.c      |   21 ++++--------
 src/decode-ipv6.c      |   48 +++++++++++----------------
 src/decode-ppp.c       |   31 +++++++++--------
 src/decode-pppoe.c     |   27 ++++++++-------
 src/decode-raw.c       |    6 ++--
 src/decode-sctp.c      |    6 ++--
 src/decode-sll.c       |    8 +++--
 src/decode-tcp.c       |    6 ++--
 src/decode-teredo.c    |   23 ++++++-------
 src/decode-udp.c       |   10 +++---
 src/decode-vlan.c      |   14 ++++----
 src/decode.c           |   47 +++++++++++++++++---------
 src/decode.h           |   36 +++++++++++---------
 src/defrag.c           |   85 ++++++++++++++++++++++++++++-------------------
 src/defrag.h           |    2 +-
 src/source-pcap-file.c |    2 +-
 20 files changed, 231 insertions(+), 223 deletions(-)


hooks/post-receive
-- 
OISF