git.ipfire.org Git - thirdparty/snort3.git/commit

]> git.ipfire.org Git - thirdparty/snort3.git/commit

projects / thirdparty / snort3.git / commit

author	Mike Stepanek (mstepane) <mstepane@cisco.com>
	Thu, 6 Aug 2020 12:42:16 +0000 (12:42 +0000)
committer	Mike Stepanek (mstepane) <mstepane@cisco.com>
	Thu, 6 Aug 2020 12:42:16 +0000 (12:42 +0000)
commit	4fafd414db5b1e20c613632588c775d719952a9e
tree	1e1971b9b0a1693211c8bdf50d39d7c99db70ec0	tree
parent	fbb33198cb68874abda48e9892723f94c1c0baa3	commit \| diff

Merge pull request #2357 in SNORT/snort3 from ~KATHARVE/snort3:ftp to master

Squashed commit of the following:

commit 0eb90fd685dadea3a9857e130e5b73fdc4e425f4
Author: Katura Harvey <katharve@cisco.com>
Date:   Tue Jul 14 15:03:59 2020 -0400

    ftp: fix direction for active data transfers;
    flow: check expected flows in flow control and add direction swap flag to expected flows

27 files changed:

src/detection/detect_trace.cc		diff \| blob \| blame \| history
src/detection/fp_detect.cc		diff \| blob \| blame \| history
src/flow/expect_cache.cc		diff \| blob \| blame \| history
src/flow/expect_cache.h		diff \| blob \| blame \| history
src/flow/flow.h		diff \| blob \| blame \| history
src/flow/flow_control.cc		diff \| blob \| blame \| history
src/flow/flow_control.h		diff \| blob \| blame \| history
src/flow/test/flow_cache_test.cc		diff \| blob \| blame \| history
src/flow/test/flow_control_test.cc		diff \| blob \| blame \| history
src/ips_options/ips_flow.cc		diff \| blob \| blame \| history
src/loggers/alert_csv.cc		diff \| blob \| blame \| history
src/loggers/alert_json.cc		diff \| blob \| blame \| history
src/loggers/unified2.cc		diff \| blob \| blame \| history
src/network_inspectors/appid/appid_session.cc		diff \| blob \| blame \| history
src/network_inspectors/appid/appid_session.h		diff \| blob \| blame \| history
src/network_inspectors/appid/service_plugins/service_ftp.cc		diff \| blob \| blame \| history
src/network_inspectors/binder/binder.cc		diff \| blob \| blame \| history
src/protocols/packet.cc		diff \| blob \| blame \| history
src/protocols/packet.h		diff \| blob \| blame \| history
src/service_inspectors/ftp_telnet/ftp_data.cc		diff \| blob \| blame \| history
src/service_inspectors/ftp_telnet/pp_ftp.cc		diff \| blob \| blame \| history
src/stream/ip/ip_session.cc		diff \| blob \| blame \| history
src/stream/stream.cc		diff \| blob \| blame \| history
src/stream/stream.h		diff \| blob \| blame \| history
src/stream/tcp/tcp_session.cc		diff \| blob \| blame \| history
src/stream/udp/udp_session.cc		diff \| blob \| blame \| history
src/stream/user/user_session.cc		diff \| blob \| blame \| history

Mirror of https://github.com/snort3/snort3.git

RSS Atom