[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.1beta2-68-gc4e1324

Fri Dec 19 11:45:48 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  c4e13246901c62851affd299e8f8e55395978304 (commit)
       via  cef609bb73c19e53ebd45247ffaa7db91a24b0d7 (commit)
       via  3499d682c475d7164324d42670bcc3fe6ac21ae7 (commit)
       via  6e69b51123aeb0696fc781215bc6571c6c159163 (commit)
       via  de4bda14e6f2b90fd1aa533327ae907205e25dd1 (commit)
       via  0ffaad66eb770b6ea48c9e34661b71ac1d64c325 (commit)
       via  8e86f387a62e8b67be3c15285a43115117e2025c (commit)
       via  c6ec92d9b14d24bb85755150b9ff47a0b480bbaf (commit)
       via  48eccf7d916333400e2cbca778c39ba733abe118 (commit)
       via  8c51b23e9436312e5939286a8335332b9bdfd70b (commit)
       via  7f80516563cfd9dc590bec42eee9e46760501542 (commit)
       via  51a782fd8c2dfdfda1047b9fe1083ef5c7395a09 (commit)
       via  a260cba32b4a521cc6a6b2a42fc3f8f2004c233b (commit)
       via  489ee20560235f763374b61f8c5ce9461753a7d3 (commit)
      from  e586644c254a5b2b71e5e3dd847c7fd7ea264352 (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 c4e13246901c62851affd299e8f8e55395978304
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Dec 17 17:15:38 2014 +0100

    flow-timeout: use packet pool

    Use packet pool for pseudo packets on flow timeout. Wait for a packet
    if necessary.

    For shutdown, alloc a new pool as the 'main()' thread calls this.

commit cef609bb73c19e53ebd45247ffaa7db91a24b0d7
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Dec 17 15:50:29 2014 +0100

    threading: lock TmThreadKillThreadsFamily

commit 3499d682c475d7164324d42670bcc3fe6ac21ae7
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Dec 10 16:41:03 2014 +0100

    flow timeout: cleanups

    Rename FlowForceReassemblyForFlowV2 to just FlowForceReassemblyForFlow
    as there is no V1.

commit 6e69b51123aeb0696fc781215bc6571c6c159163
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Dec 2 17:40:31 2014 +0100

    flow timeout: cleanup

    Remove now unused old flow timeout code.

commit de4bda14e6f2b90fd1aa533327ae907205e25dd1
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Dec 2 10:02:27 2014 +0100

    stream: handle flow timeout stream end packets

    Handle flow timeout packets in the stream engine. Previously the flow
    timeout code would call reassembly code directly.

commit 0ffaad66eb770b6ea48c9e34661b71ac1d64c325
Author: Victor Julien <victor at inliniac.net>
Date:   Mon Dec 1 19:18:45 2014 +0100

    flow-time: disable remainder of the old timeout code

    Disable registration code that was looking for threadvars
    and slots as timeout handling is now done in a live engine.

commit 8e86f387a62e8b67be3c15285a43115117e2025c
Author: Victor Julien <victor at inliniac.net>
Date:   Mon Dec 1 18:48:03 2014 +0100

    flow-time: use live threads at shutdown

    Update pktacq loop to process flow timeouts in a running engine.

    Add a new step to the shutdown phase of packet acquisition loop
    threads (pktacqloop).

    The shutdown code lets the pktacqloop break out of it's packet
    acquisition loop. The thread then enters a flow timeout loop, where
    it processes packets from it's tv->stream_pq queue until it's
    empty _and_ the KILL flag is set.

    Make sure receive threads are done before moving on to flow hash
    cleanup (recycle all). Without this the flow recycler could start
    it's unconditional hash clean up while detect threads are still
    running on the flows.

    Update unix socket to match live modes.

commit c6ec92d9b14d24bb85755150b9ff47a0b480bbaf
Author: Victor Julien <victor at inliniac.net>
Date:   Mon Dec 1 13:53:30 2014 +0100

    flow-timeout: use live threads

    Use live threads. Disable old timeout code.

commit 48eccf7d916333400e2cbca778c39ba733abe118
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Nov 25 11:50:03 2014 +0100

    Assign thread_id to flow on first packet stream engine

commit 8c51b23e9436312e5939286a8335332b9bdfd70b
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Dec 10 11:49:30 2014 +0100

    Thread registration: id's start at 1

    Start thread id's at 1, so that in flow's we can use 0 to indicate
    a thread id hasn't been set in it yet.

commit 7f80516563cfd9dc590bec42eee9e46760501542
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Nov 25 15:52:38 2014 +0100

    Introduce Flow timeout injection api

    Add function TmThreadsInjectPacketById that is to be used to inject flow
    timeout packets into the threads stream_pq queue.

    TmThreadsInjectPacketById will also wake up listening threads if
    applicable.

    Packets are passed all packets together in an NULL terminated array
    to reduce locking overhead.

commit 51a782fd8c2dfdfda1047b9fe1083ef5c7395a09
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Nov 25 11:07:03 2014 +0100

    Define FlowThreadId and add it to the flow

    16 bits id should be enough for threads for a while.

commit a260cba32b4a521cc6a6b2a42fc3f8f2004c233b
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Nov 25 15:05:06 2014 +0100

    Give easy access for thread stream packet queue

    Access it from ThreadVars. This allows for easy injection of packets
    into the stream engine.

commit 489ee20560235f763374b61f8c5ce9461753a7d3
Author: Victor Julien <victor at inliniac.net>
Date:   Mon Nov 24 23:17:37 2014 +0100

    Thread Registration API for ID's

    Create thread registration and unregistration API for assigning unique
    thread id's.

    Threadvars is static even if a thread restarts, so we can do the
    registration before the threads start.

    A thread is unregistered when the ThreadVars are freed.

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

Summary of changes:
 src/decode.c              |    5 +-
 src/decode.h              |    3 +-
 src/flow-manager.c        |    3 +-
 src/flow-timeout.c        |  336 +++++-------------------------------------
 src/flow-timeout.h        |    2 +-
 src/flow-util.h           |    2 +
 src/flow.h                |    6 +
 src/runmode-unix-socket.c |   14 +-
 src/source-pcap-file.c    |    2 +-
 src/stream-tcp.c          |   26 ++++
 src/suricata.c            |   12 +-
 src/threadvars.h          |    5 +
 src/tm-threads.c          |  357 ++++++++++++++++++++++++++++++++++++++++++---
 src/tm-threads.h          |    9 +-
 14 files changed, 444 insertions(+), 338 deletions(-)

hooks/post-receive
-- 
OISF