]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #1299 in SNORT/snort3 from stream_tcp_fin_handling to master
authorTom Peters (thopeter) <thopeter@cisco.com>
Thu, 5 Jul 2018 18:16:10 +0000 (14:16 -0400)
committerTom Peters (thopeter) <thopeter@cisco.com>
Thu, 5 Jul 2018 18:16:10 +0000 (14:16 -0400)
commitbdaef0207745fd26b085768167a2b6ba15d14c7c
tree38c6486de7fbb4622025d9704643535595432657
parente7cb1752bb2cd2bd13a82d3753af4276f4ed52e3
Merge pull request #1299 in SNORT/snort3 from stream_tcp_fin_handling to master

Squashed commit of the following:

commit 506ca045fd6219e2e8fcdc50735e9d8a0e36a20e
Author: davis mcpherson <davmcphe.cisco.com>
Date:   Wed Jun 27 10:45:15 2018 -0400

    stream_tcp: 86 r_nxt_ack as tracker state for next rx seq, use rcv_nxt instead

commit 45aa8684c57804309b298dcb4fe797274a09e987
Author: davis mcpherson <davmcphe.cisco.com>
Date:   Thu Jun 21 14:18:04 2018 -0400

    stream_tcp: back out fin handling changes for bug not relevant to snort3
15 files changed:
src/stream/libtcp/tcp_state_machine.cc
src/stream/libtcp/tcp_stream_tracker.cc
src/stream/libtcp/tcp_stream_tracker.h
src/stream/tcp/tcp_debug_trace.h
src/stream/tcp/tcp_module.cc
src/stream/tcp/tcp_module.h
src/stream/tcp/tcp_normalizer.cc
src/stream/tcp/tcp_normalizers.cc
src/stream/tcp/tcp_reassembler.cc
src/stream/tcp/tcp_session.cc
src/stream/tcp/tcp_session.h
src/stream/tcp/tcp_state_close_wait.cc
src/stream/tcp/tcp_state_closing.cc
src/stream/tcp/tcp_state_established.cc
src/stream/tcp/tcp_state_syn_sent.cc