[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.0beta2-93-g657b83d

Tue Jan 21 15:08:11 UTC 2014

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  657b83d23827725793d2e3af6f74655c928b016a (commit)
       via  9a21a2f64ba1a8f2a74786e83bd805fb1cc74ff2 (commit)
       via  66f764ce7b9d4d310df918f9ed671ebab9338bd5 (commit)
       via  09e5ea230ac995db3821d486ad72132ce0574d95 (commit)
       via  5f307acacec2cb4f2c015a2d79c82a0faebcb4ff (commit)
       via  b844d4315f95811e706cbe326d40af2b92d5a447 (commit)
       via  850fac84d679e0c2006a646f63e74ae36de3d41f (commit)
       via  d97e93ea714ecf7c32619cce6ba31d3981718cc5 (commit)
       via  0130a89d523c9814228c6ffc5ad0fb0e2f11852b (commit)
      from  80456f3e7d69aabc8d69db02a1ca1c2ed1f736d0 (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 657b83d23827725793d2e3af6f74655c928b016a
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Jan 21 14:51:56 2014 +0100

    dns: add event for when memcap is reached

    Raise event if state-memcap is reached for a flow.

commit 9a21a2f64ba1a8f2a74786e83bd805fb1cc74ff2
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Jan 21 14:18:37 2014 +0100

    dns: update counters

    This patch updates the DNS counters from the main AppLayer entry
    functions. Due to the limited scope of AppLayerThreadCtx some of
    the logic had to be implemented in app-layer.c, where it doesn't
    belong.

commit 66f764ce7b9d4d310df918f9ed671ebab9338bd5
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Jan 21 13:22:48 2014 +0100

    dns: register counters

    Register dns memory counters.
    Keep track of memcap reached conditions, and increment counters for
    those.

commit 09e5ea230ac995db3821d486ad72132ce0574d95
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Jan 21 13:50:38 2014 +0100

    app-layer: update UDP entry function

    Update AppLayerHandleUdp to take the ThreadVars pointer as an
    argument in prepraration of handling counters in this function.

commit 5f307acacec2cb4f2c015a2d79c82a0faebcb4ff
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Jan 21 13:42:10 2014 +0100

    Pass ThreadVars ptr to various thread init funcs

    To be able to register counters from AppLayerGetCtxThread, the
    ThreadVars pointer needs to be available in it and thus in it's
    callers:

    - AppLayerGetCtxThread
    - DecodeThreadVarsAlloc
    - StreamTcpReassembleInitThreadCtx

commit b844d4315f95811e706cbe326d40af2b92d5a447
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Jan 21 12:01:07 2014 +0100

    dns: add memcap checking

    Add memuse tracking and memcap checking to the DNS parsers. Memuse
    is tracked globally and per flow (state).

    Memcaps are also checked per flow and globally before memory allocs
    are done.

commit 850fac84d679e0c2006a646f63e74ae36de3d41f
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Jan 21 10:58:51 2014 +0100

    dns: make DNSTransactionAlloc static

commit d97e93ea714ecf7c32619cce6ba31d3981718cc5
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Jan 21 10:39:50 2014 +0100

    dns: add memcap options

    Add per state and global memcap option parsing.

commit 0130a89d523c9814228c6ffc5ad0fb0e2f11852b
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Jan 21 10:27:28 2014 +0100

    dns: fix dns configure code

    Yaml layout changed. DNS had to be updated to retrievel value
    for dns flood from the correct location in the config tree.

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

Summary of changes:
 rules/dns-events.rules       |    2 +
 src/app-layer-dns-common.c   |  103 ++++++++++++++++++++++++++++++++++++++---
 src/app-layer-dns-common.h   |   14 +++++-
 src/app-layer-dns-tcp.c      |    4 ++
 src/app-layer-dns-udp.c      |   28 +++++++++++-
 src/app-layer.c              |   46 +++++++++++++++++-
 src/app-layer.h              |    5 +-
 src/decode-udp.c             |    2 +-
 src/decode.c                 |    5 +-
 src/decode.h                 |    2 +-
 src/detect-app-layer-event.c |    6 +-
 src/detect-fragbits.c        |    4 +-
 src/detect-replace.c         |    2 +-
 src/source-af-packet.c       |    2 +-
 src/source-erf-dag.c         |    2 +-
 src/source-erf-file.c        |    2 +-
 src/source-ipfw.c            |    2 +-
 src/source-napatech.c        |    2 +-
 src/source-nfq.c             |    2 +-
 src/source-pcap-file.c       |    2 +-
 src/source-pcap.c            |    2 +-
 src/source-pfring.c          |    2 +-
 src/stream-tcp-reassemble.c  |   50 ++++++++++----------
 src/stream-tcp-reassemble.h  |    2 +-
 src/stream-tcp-util.c        |    2 +-
 src/stream-tcp.c             |   24 +++++-----
 26 files changed, 245 insertions(+), 74 deletions(-)

hooks/post-receive
-- 
OISF