[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.0beta1-359-g5330b1c

[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  5330b1cae1b1761e2911e9ddc0a9a94a2a55c034 (commit)
       via  ab7677638e09289bd1189eb4c1648d4dd79abb8b (commit)
      from  e392c0a4ce782e53a66355a30235c385500ce3dd (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 5330b1cae1b1761e2911e9ddc0a9a94a2a55c034
Author: Victor Julien <victor at inliniac.net>
Date:   Fri Nov 22 18:11:10 2013 +0100

    detect: don't consider smsgs for no inspect flag
    
    When the PKT_NOPAYLOAD_INSPECTION flag is set, don't apply it to smsgs.
    This way we can still inspect the outstanding smsgs.
    
    The PKT_NOPAYLOAD_INSPECTION is set for encrypted traffic, and is combined
    with disabling stream reassembly. So we only inspect the smsgs up to the
    point of the disable detection point.

commit ab7677638e09289bd1189eb4c1648d4dd79abb8b
Author: Victor Julien <victor at inliniac.net>
Date:   Fri Nov 22 18:00:54 2013 +0100

    stream: improve raw reassembly
    
    When checking the reassembly limit for raw reassembly, consider the
    STREAMTCP_STREAM_FLAG_NOREASSEMBLY a trigger immediately. We won't
    process any more segments in the reassembly engine anyway.

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

Summary of changes:
 src/detect.c                |    3 ++-
 src/stream-tcp-reassemble.c |    5 +++++
 2 files changed, 7 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
OISF