[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-1.3.1-68-g84e0d76

[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  84e0d76406aea435cb31cf05ca9d080ec17208b6 (commit)
       via  bfd6dea38fd6ad11e56e98f9602513628aa7a3d9 (commit)
       via  fa079c1da0c7cef3d3346e0130407a3231d0ec29 (commit)
       via  cd76c7e5fbf6c1ef455d0dc373f5e379af2342f1 (commit)
       via  b58ecd833a68fbc9e8e8ecba52527d816fe551c7 (commit)
       via  71b4257bc23840c8dabdf598cb8ce1a02a54b129 (commit)
       via  fd7b6db22d224609617f5b3085057d83acf2ebbc (commit)
      from  ac56b1bf24e5003806c85fe549fc7fcd24e1d627 (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 84e0d76406aea435cb31cf05ca9d080ec17208b6
Author: Eric Leblond <eric at regit.org>
Date:   Thu Aug 30 09:54:53 2012 +0200

    doxygen: generate doc for acquisition modules
    
    This patch sets some define to generate doc for the acquisition
    modules. It also suppress the doc generation for unittests which
    was polluting the output.

commit bfd6dea38fd6ad11e56e98f9602513628aa7a3d9
Author: Eric Leblond <eric at regit.org>
Date:   Thu Aug 30 09:54:34 2012 +0200

    pool: update doxygen documentation.

commit fa079c1da0c7cef3d3346e0130407a3231d0ec29
Author: Eric Leblond <eric at regit.org>
Date:   Wed Aug 29 12:27:26 2012 +0200

    pool: realize a block allocation for preallocated item.
    
    This patch required a evolution of Pool API as it is needed to
    proceed to alloc or init separetely. The PoolInit has been changed
    with a new Init function parameter.

commit cd76c7e5fbf6c1ef455d0dc373f5e379af2342f1
Author: Eric Leblond <eric at regit.org>
Date:   Thu Jul 26 15:02:20 2012 +0200

    pool: alloc a single area for all PoolBuckets
    
    As we know the number and the size of PoolBucket, we can simply
    allocate a single memory zone.

commit b58ecd833a68fbc9e8e8ecba52527d816fe551c7
Author: Eric Leblond <eric at regit.org>
Date:   Wed Aug 22 15:39:27 2012 +0200

    l3proto: add unit tests
    
    This patch adds a series of unit tests. First two check test the keyword
    by checking packet on signatures using it. Last one adds is here to check
    that there is no interaction of l3_proto and ip_proto.

commit 71b4257bc23840c8dabdf598cb8ce1a02a54b129
Author: Eric Leblond <eric at regit.org>
Date:   Fri Jul 13 15:46:02 2012 +0200

    sig: add l3_proto keyword
    
    This patch adds a l3_proto keyword to the signature language. It
    can be used to specify if the signature has to match on IPv4, IPv6
    or both. For example, one can write:
      alert http any any -> any 22 (msg: "HTTP v6"; l3_proto:ip6; sid:14;)
    
    This should close #494.

commit fd7b6db22d224609617f5b3085057d83acf2ebbc
Author: Eric Leblond <eric at regit.org>
Date:   Fri Jul 13 15:44:31 2012 +0200

    sig: Add ipv6 and ipv4 to list of protocols
    
    With this patch it is possible to do:
     alert ipv6 any any -> any any
    or
     alert ip4 any any -> any any
    to match on IPv4 or IPv6 packets.

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

Summary of changes:
 doxygen.cfg                                |    2 +-
 src/Makefile.am                            |    1 +
 src/app-layer-parser.c                     |   15 +-
 src/defrag.c                               |   48 ++---
 src/detect-engine-iponly.c                 |    9 +
 src/detect-engine-proto.c                  |   10 +
 src/detect-engine-proto.h                  |    8 +-
 src/detect-ipproto.c                       |    8 +-
 src/detect-l3proto.c                       |  393 ++++++++++++++++++++++++++++
 src/{alert-pcapinfo.h => detect-l3proto.h} |   15 +-
 src/detect.c                               |   11 +
 src/detect.h                               |    2 +
 src/stream-tcp-reassemble.c                |   26 ++-
 src/stream-tcp.c                           |   24 +-
 src/stream.c                               |   22 +--
 src/util-pool.c                            |  192 ++++++++++----
 src/util-pool.h                            |   25 ++-
 17 files changed, 672 insertions(+), 139 deletions(-)
 create mode 100644 src/detect-l3proto.c
 copy src/{alert-pcapinfo.h => detect-l3proto.h} (74%)


hooks/post-receive
-- 
OISF