]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #2189 in SNORT/snort3 from ~DAVMCPHE/snort3:fallback to master
authorRuss Combs (rucombs) <rucombs@cisco.com>
Fri, 15 May 2020 21:40:47 +0000 (21:40 +0000)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Fri, 15 May 2020 21:40:47 +0000 (21:40 +0000)
commit9ac36fc03aa705b7b6ec070db758fa931d168f48
tree0fd67cd989dc627d86a802c8a4c15a084f7a170c
parent1cb589517e7dde2638f644739cd58f8669b1ea96
Merge pull request #2189 in SNORT/snort3 from ~DAVMCPHE/snort3:fallback to master

Squashed commit of the following:

commit 0031d861c9c23b1a08e27a77d10d8ee68f4f7fb4
Author: davis mcpherson <davmcphe@cisco.com>
Date:   Fri May 1 13:23:54 2020 -0400

    dce_rpc: code style cleanups

commit 5a9614634d99202a0202494b6021116edea1d7e4
Author: davis mcpherson <davmcphe@cisco.com>
Date:   Wed Apr 29 11:24:49 2020 -0400

    dce_rpc: generate alert when dce splitter aborts due to invalid fragment length

commit 75e56ee0f0a6e875c13de32963b58f15e3c43c7f
Author: davis mcpherson <davmcphe@cisco.com>
Date:   Fri May 8 17:16:47 2020 -0400

    stream_tcp: call splitter->finish() before reassemble() when flushing when PAF aborts due to gap in queued data

commit 39336beb1c4421ebb2124a2beb20ae1c8a5ae9b1
Author: russ <rucombs@cisco.com>
Date:   Tue Apr 21 14:20:50 2020 -0400

    stream_tcp: clear gadget from Flow object once fallback has happened in both directions

    stream_tcp: when paf aborts due to gap in data set splitter state to ABORT

    stream_tcp: only clear gadget after both splitters have aborted

    loggers: when logging alert only use inspector buffers and name when the inspector's paf splitter is assigned for the direction of the alert"
18 files changed:
src/log/log_text.cc
src/log/log_text.h
src/loggers/alert_fast.cc
src/service_inspectors/dce_rpc/dce_tcp_paf.cc
src/stream/paf.cc
src/stream/stream.h
src/stream/tcp/segment_overlap_editor.h
src/stream/tcp/stream_tcp.cc
src/stream/tcp/tcp_defs.h
src/stream/tcp/tcp_module.cc
src/stream/tcp/tcp_module.h
src/stream/tcp/tcp_normalizers.cc
src/stream/tcp/tcp_reassembler.cc
src/stream/tcp/tcp_reassembler.h
src/stream/tcp/tcp_segment_node.cc
src/stream/tcp/tcp_session.cc
src/stream/tcp/tcp_session.h
src/stream/tcp/tcp_stream_session.cc