[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.1beta1-136-ga781fc5

[OISF Git]

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  a781fc5c2ea047c7ea3774edbf890001987b82cc (commit)
       via  503cc3de690be563762956f6639fcec16e7a1d79 (commit)
       via  1656148490272a9b1f13dff7f5534e13e9b46bd2 (commit)
      from  b2e80a0f661942dc2ee1899417039954c1856187 (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 a781fc5c2ea047c7ea3774edbf890001987b82cc
Author: Ken Steele <ken at tilera.com>
Date:   Wed Oct 29 15:43:42 2014 -0400

    Make suricata_ctl_flags be volatile
    
    The global variable suricata_ctl_flags needs to volatile, otherwise the
    compiler might not cause the variable to be read every time because it
    doesn't know other threads might write the variable.
    
    This was causing Suricata to not exit under some conditions.

commit 503cc3de690be563762956f6639fcec16e7a1d79
Author: Victor Julien <victor at inliniac.net>
Date:   Thu Oct 30 11:07:38 2014 +0100

    stream/async: improve handling of syn/ack pickup
    
    If we picked up the ssn with a syn/ack, we don't need to make more
    assumptions about sack and wscale after that.

commit 1656148490272a9b1f13dff7f5534e13e9b46bd2
Author: Victor Julien <victor at inliniac.net>
Date:   Thu Oct 30 10:16:40 2014 +0100

    stream/async: fix session setup issues
    
    For these 2 cases:
    
    1. Missing SYN:
    -> syn <= missing
    <- syn/ack
    -> ack
    -> data
    
    2. Missing SYN and 3whs ACK:
    -> syn <= missing
    <- syn/ack
    -> ack <= missing
    -> data
    
    Fix session pickup. The next_win settings weren't correctly set, so that
    packets were rejected.
    
    Bug 1190.

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

Summary of changes:
 src/source-af-packet.c |    1 -
 src/source-erf-dag.c   |    1 -
 src/source-mpipe.c     |    2 --
 src/source-napatech.c  |    1 -
 src/source-pcap-file.c |    1 -
 src/source-pcap.c      |    2 --
 src/source-pfring.c    |    1 -
 src/stream-tcp.c       |   17 +++++++++++------
 src/suricata.c         |    2 +-
 src/suricata.h         |    4 ++--
 10 files changed, 14 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
OISF