]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #1343 in SNORT/snort3 from s_switcher_usage to master
authorMichael Altizer (mialtize) <mialtize@cisco.com>
Tue, 28 Aug 2018 20:24:49 +0000 (16:24 -0400)
committerMichael Altizer (mialtize) <mialtize@cisco.com>
Tue, 28 Aug 2018 20:24:49 +0000 (16:24 -0400)
commit84fdf350be27cd4aec6b36204864a511bf397d23
tree98b7b80be674cdad3d6e9df5c02ce5d7f10189c8
parenteb80170fef84469b0e06e2876a6c8f4159cd0bf6
Merge pull request #1343 in SNORT/snort3 from s_switcher_usage to master

Squashed commit of the following:

commit e1b965c371481d6d49f68166f4bb338ad7c80649
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Thu Aug 23 16:25:18 2018 -0400

    DetectionEngine: don't use s_switcher to get file data

commit 1b5ef8073bf6615b14e6e17c40818e4d63c35df7
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Thu Aug 23 15:13:19 2018 -0400

    DetectionEngine: use packet to reference context
src/detection/detection_engine.cc
src/detection/detection_engine.h
src/detection/detection_options.cc
src/ips_options/ips_file_data.cc
src/log/log_text.cc
src/service_inspectors/http2_inspect/http2_inspect.cc