[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.0beta2-249-g7726cec

[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  7726cecbaadd133aa10ce3bd8435ee3beadbfeff (commit)
       via  29fb9b099addca2178c8f38dfc52588f28f3ae8a (commit)
       via  2cd6e1287f49cd1c142de799dcd1c07d28b3084c (commit)
       via  1ccb93ab50f890e077d4ea894f9c9a75c67a7092 (commit)
       via  e871f7132b08e41f28e0b5763393bd5453e402d9 (commit)
       via  1fb7c0dddc97b20c0ac03d6810f4e76bce523a57 (commit)
       via  71e47868bf469098bc730063fe304c506264a561 (commit)
      from  3967bd5517e7ab57fd82d7ce9b70dac16057b8f7 (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 7726cecbaadd133aa10ce3bd8435ee3beadbfeff
Author: Victor Julien <victor at inliniac.net>
Date:   Fri Feb 7 15:06:43 2014 +0100

    Fix CUDA test warning.

commit 29fb9b099addca2178c8f38dfc52588f28f3ae8a
Author: Anoop Saldanha <anoopsaldanha at gmail.com>
Date:   Wed Feb 5 08:47:45 2014 +0530

    CUDA: Fix header file resolution issues.

commit 2cd6e1287f49cd1c142de799dcd1c07d28b3084c
Author: Eric Leblond <eric at regit.org>
Date:   Fri Feb 7 11:13:38 2014 +0100

    af-packet: no VLAN id from msg header for old kernel
    
    This patch uses the new function SCKernelVersionIsAtLeast to know
    that we've got a old kernel that do not strip the VLAN header from
    the message before sending it to userspace.

commit 1ccb93ab50f890e077d4ea894f9c9a75c67a7092
Author: Eric Leblond <eric at regit.org>
Date:   Fri Feb 7 11:11:14 2014 +0100

    Add new function to work on kernel version.
    
    This patch adds a new file containing a function that can be used
    to compare the version number of the running kernel with a specific
    version.

commit e871f7132b08e41f28e0b5763393bd5453e402d9
Author: Eric Leblond <eric at regit.org>
Date:   Thu Feb 6 13:54:10 2014 +0100

    af-packet: improve VLAN detection
    
    Since commit in kernel
      commit a3bcc23e890a6d49d6763d9eb073d711de2e0469
      Author: Ben Greear <greearb at candelatech.com>
      Date:   Wed Jun 1 06:49:10 2011 +0000
    
          af-packet: Add flag to distinguish VID 0 from no-vlan.
    a flag is set to indicate VLAN has been set in packet header.
    
    As suggested in commit message, using a test of the flag followed
    by a check on vci value ensure backward compatibility of the test.

commit 1fb7c0dddc97b20c0ac03d6810f4e76bce523a57
Author: Eric Leblond <eric at regit.org>
Date:   Tue Feb 4 11:49:42 2014 +0100

    af-packet: handle vlan counter
    
    This patch adds a vlan counter increment in decodeAFP. This
    is needed to take into account vlan_id set by the packet
    reading function.

commit 71e47868bf469098bc730063fe304c506264a561
Author: Eric Leblond <eric at regit.org>
Date:   Thu Jan 30 18:11:10 2014 +0100

    af-packet: get vlan id from header
    
    Since kernel 3.8, the VLAN header are stripped from packet. So the
    first VLAN id can only be fetched from the tpacket header at capture
    time.

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

Summary of changes:
 src/Makefile.am                            |    1 +
 src/decode.c                               |    1 +
 src/source-af-packet.c                     |   33 +++++++++
 src/util-cuda-buffer.c                     |    3 +
 src/util-host-info.c                       |  106 ++++++++++++++++++++++++++++
 src/{alert-pcapinfo.h => util-host-info.h} |   10 ++--
 src/util-mpm-ac.h                          |    4 +
 7 files changed, 153 insertions(+), 5 deletions(-)
 create mode 100644 src/util-host-info.c
 copy src/{alert-pcapinfo.h => util-host-info.h} (77%)


hooks/post-receive
-- 
OISF