]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #1206 in SNORT/snort3 from file_type_strings1 to master
authorHui Cao (huica) <huica@cisco.com>
Mon, 7 May 2018 13:07:50 +0000 (09:07 -0400)
committerHui Cao (huica) <huica@cisco.com>
Mon, 7 May 2018 13:07:50 +0000 (09:07 -0400)
commit8197df559ed7b0f2be68b32df9ba9b89a5fc23f2
tree1e230d5d210c24afd04d47bf3d91023352d44e2f
parent83fb503474e39f247ad6c1f8bd47c4c79df6faa7
Merge pull request #1206 in SNORT/snort3 from file_type_strings1 to master

Squashed commit of the following:

commit a7e1439ed447f31a501cf3342b4d8f6ce67e70b0
Author: Steve Chew <stechew@cisco.com>
Date:   Fri Apr 27 17:07:43 2018 -0400

    file_type: Require strings instead of integers for types. Handle versions.
src/file_api/file_api.h
src/file_api/file_config.cc
src/file_api/file_config.h
src/file_api/file_flows.cc
src/file_api/file_identifier.cc
src/file_api/file_identifier.h
src/ips_options/ips_file_type.cc