[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.0beta1-315-g7ebd1e6

[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  7ebd1e6433bfdf7c66d70156f82ad4940a186c70 (commit)
       via  9e88c51e24b68c938bbfd297cb92a50e11786b8e (commit)
       via  ed03196a20cc1ec7a9e54420e0fad8f181085699 (commit)
       via  45dfecafd4475b30bff13a19134f4770e7dee859 (commit)
       via  49087f21e4f33398927982d97dd06a0212140659 (commit)
      from  64f5129f124b8077c8417326feb9b650849d0a74 (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 7ebd1e6433bfdf7c66d70156f82ad4940a186c70
Author: Victor Julien <victor at inliniac.net>
Date:   Thu Oct 31 11:39:59 2013 +0100

    Counters: fix delayed-detect counter registration
    
    Make sure we register the detect.alerts counter before packet runtime starts
    even in delayed detect mode. The registration of new counters at packet
    runtime is not supported by the counters api and might lead to crashes as there
    is no proper locking to allow for this operation.
    
    This changes how delayed detect works a bit. Now we call the ThreadInit
    callback twice. The first call will only register the counter. The 2nd call
    will do all the other setup. This way the counter is registered before the
    counters api starts operating in the packet runtime.
    
    Fixes the segv reported in ticket #1018.

commit 9e88c51e24b68c938bbfd297cb92a50e11786b8e
Author: Victor Julien <victor at inliniac.net>
Date:   Thu Oct 31 09:31:08 2013 +0100

    Counters: move perf critical var to the top of the SCPerfContext struct

commit ed03196a20cc1ec7a9e54420e0fad8f181085699
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Oct 30 19:51:14 2013 +0100

    Counter: fix accidental logic change

commit 45dfecafd4475b30bff13a19134f4770e7dee859
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Oct 30 19:42:09 2013 +0100

    Counters: remove unused updated field

commit 49087f21e4f33398927982d97dd06a0212140659
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Oct 30 12:22:14 2013 +0100

    Optimizations to reduce branch misses

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

Summary of changes:
 src/alert-unified2-alert.c |   18 +++++++-----
 src/counters.c             |    4 +--
 src/counters.h             |    9 ++----
 src/decode-ethernet.c      |    4 +-
 src/decode-ipv4.c          |   48 ++++++++++++++++----------------
 src/decode-ipv6.c          |   12 ++++----
 src/decode-ppp.c           |   65 +++++++++++++++++++++----------------------
 src/decode-raw.c           |    2 +-
 src/decode-sll.c           |    4 +-
 src/decode-tcp.c           |    2 +-
 src/decode-udp.c           |   12 ++++----
 src/decode.c               |   10 +++---
 src/detect-engine.c        |   29 ++++++++++++++++++-
 src/detect.h               |    2 +
 src/stream-tcp.c           |   14 +++++-----
 src/suricata.c             |    1 +
 src/tm-threads.c           |    1 -
 17 files changed, 131 insertions(+), 106 deletions(-)


hooks/post-receive
-- 
OISF