]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #2243 in SNORT/snort3 from ~CYLEONAR/snort3:master to master
authorCynthia Leonard (cyleonar) <cyleonar@cisco.com>
Fri, 5 Jun 2020 16:54:16 +0000 (16:54 +0000)
committerCynthia Leonard (cyleonar) <cyleonar@cisco.com>
Fri, 5 Jun 2020 16:54:16 +0000 (16:54 +0000)
commit59cfcb6ac6564174bdb9673a3f32e65607fcebc3
treefce2871c3c8ad99a4bd2a4fab58196728a7e3c60
parent0ab74bbcee6d23bbb9e136bfaf796230f1252cdb
Merge pull request #2243 in SNORT/snort3 from ~CYLEONAR/snort3:master to master

Squashed commit of the following:

commit b2403b08ffe3bba0d23569f5b7a973943481e689
Author: Cynthia Leonard <cyleonar@cisco.com>
Date:   Fri Jun 5 12:45:15 2020 -0400

    Revert "Merge pull request #2017 in SNORT/snort3 from ~SUNIMUKH/snort3:drop_servicability to master"

    This reverts commit 0ab74bbcee6d23bbb9e136bfaf796230f1252cdb.
24 files changed:
src/actions/actions.cc
src/file_api/file_cache.cc
src/file_api/file_lib.cc
src/flow/flow_control.cc
src/flow/test/flow_cache_test.cc
src/flow/test/flow_control_test.cc
src/main/CMakeLists.txt
src/main/analyzer.cc
src/main/test/distill_verdict_test.cc
src/main/test/stubs.h
src/network_inspectors/packet_tracer/packet_tracer.cc
src/network_inspectors/packet_tracer/packet_tracer.h
src/network_inspectors/reputation/reputation_inspect.cc
src/packet_io/active.cc
src/packet_io/active.h
src/packet_io/sfdaq_instance.cc
src/packet_io/sfdaq_instance.h
src/service_inspectors/dce_rpc/dce_smb_utils.cc
src/service_inspectors/ftp_telnet/ftp_data.cc
src/stream/stream.cc
src/stream/tcp/tcp_event_logger.cc
src/stream/tcp/tcp_normalizer.cc
src/stream/tcp/tcp_state_fin_wait2.cc
src/stream/tcp/tcp_state_syn_recv.cc