]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #1841 in SNORT/snort3 from ~DAVMCPHE/snort3:stream_consolidate_sou...
authorRuss Combs (rucombs) <rucombs@cisco.com>
Tue, 3 Dec 2019 02:57:37 +0000 (02:57 +0000)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Tue, 3 Dec 2019 02:57:37 +0000 (02:57 +0000)
commit457261fd226102205a0628b189eb43c0df054e19
treedb088671161753205c194cee1c61250042f8a55e
parent68de3e5dacd2d4082d37c0c7373d14928683eca7
Merge pull request #1841 in SNORT/snort3 from ~DAVMCPHE/snort3:stream_consolidate_source_files to master

Squashed commit of the following:

commit e50ee5a0450248a37a310b42f9be1e8868cacaa9
Author: davis mcpherson <davmcphe@cisco.com>
Date:   Mon Nov 25 10:46:55 2019 -0500

    stream_tcp: updates from PR review comments

commit 88137cf6242a9378cf6351882f7631947bff9d84
Author: davis mcpherson <davmcphe@cisco.com>
Date:   Mon Nov 11 08:58:57 2019 -0500

    stream_tcp: move and update the libtcp source files to the tcp source directory to consolidate the stream tcp code into one component (libtcp goes away)
43 files changed:
src/CMakeLists.txt
src/service_inspectors/dce_rpc/dce_http_proxy.cc
src/service_inspectors/dce_rpc/dce_http_server.cc
src/stream/CMakeLists.txt
src/stream/libtcp/CMakeLists.txt [deleted file]
src/stream/libtcp/dev_notes.txt [deleted file]
src/stream/stream.cc
src/stream/tcp/CMakeLists.txt
src/stream/tcp/dev_notes.txt
src/stream/tcp/ips_stream_reassemble.cc
src/stream/tcp/stream_tcp.cc
src/stream/tcp/tcp_normalizer.cc
src/stream/tcp/tcp_normalizers.cc
src/stream/tcp/tcp_reassemblers.cc
src/stream/tcp/tcp_segment_descriptor.cc [moved from src/stream/libtcp/tcp_segment_descriptor.cc with 100% similarity]
src/stream/tcp/tcp_segment_descriptor.h [moved from src/stream/libtcp/tcp_segment_descriptor.h with 100% similarity]
src/stream/tcp/tcp_segment_node.h
src/stream/tcp/tcp_session.cc
src/stream/tcp/tcp_session.h
src/stream/tcp/tcp_state_close_wait.h
src/stream/tcp/tcp_state_closed.h
src/stream/tcp/tcp_state_closing.h
src/stream/tcp/tcp_state_established.h
src/stream/tcp/tcp_state_fin_wait1.h
src/stream/tcp/tcp_state_fin_wait2.h
src/stream/tcp/tcp_state_handler.cc [moved from src/stream/libtcp/tcp_state_handler.cc with 99% similarity]
src/stream/tcp/tcp_state_handler.h [moved from src/stream/libtcp/tcp_state_handler.h with 98% similarity]
src/stream/tcp/tcp_state_last_ack.h
src/stream/tcp/tcp_state_listen.h
src/stream/tcp/tcp_state_machine.cc [moved from src/stream/libtcp/tcp_state_machine.cc with 68% similarity]
src/stream/tcp/tcp_state_machine.h [moved from src/stream/libtcp/tcp_state_machine.h with 84% similarity]
src/stream/tcp/tcp_state_none.h
src/stream/tcp/tcp_state_syn_recv.h
src/stream/tcp/tcp_state_syn_sent.h
src/stream/tcp/tcp_state_time_wait.h
src/stream/tcp/tcp_stream_session.cc [moved from src/stream/libtcp/tcp_stream_session.cc with 100% similarity]
src/stream/tcp/tcp_stream_session.h [moved from src/stream/libtcp/tcp_stream_session.h with 98% similarity]
src/stream/tcp/tcp_stream_state_machine.cc [deleted file]
src/stream/tcp/tcp_stream_state_machine.h [deleted file]
src/stream/tcp/tcp_stream_tracker.cc [moved from src/stream/libtcp/tcp_stream_tracker.cc with 100% similarity]
src/stream/tcp/tcp_stream_tracker.h [moved from src/stream/libtcp/tcp_stream_tracker.h with 98% similarity]
src/stream/tcp/test/stream_tcp_test_utils.cc [moved from src/stream/libtcp/stream_tcp_unit_test.cc with 95% similarity]
src/stream/tcp/test/stream_tcp_test_utils.h [moved from src/stream/libtcp/stream_tcp_unit_test.h with 90% similarity]