]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #982 in SNORT/snort3 from snort2lua_tbd to master
authorRuss Combs (rucombs) <rucombs@cisco.com>
Thu, 3 Aug 2017 22:16:37 +0000 (18:16 -0400)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Thu, 3 Aug 2017 22:16:37 +0000 (18:16 -0400)
commit8095dfa7363caef8f83fdff47734166c57ddfb98
tree1b2db956294bc4cb4aaadbffdf2b15690cca1118
parent30c62bdbed0e6188e09ad17cc601d2ca55bbf23f
Merge pull request #982 in SNORT/snort3 from snort2lua_tbd to master

Squashed commit of the following:

commit d1fa8d0f7e525c7be5834598f882681e430e1132
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Thu Aug 3 18:12:45 2017 -0400

    snort2lua: removed dead comments

commit 86f07d1a0038cfb3da576e8bacd8af9868e9a068
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Fri Jul 28 15:24:58 2017 -0400

    snort2lua: added dynamicoutput to deleted list

commit 523ddfa51f0301c7e106c74b9745b3f35d561a6d
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Fri Jul 28 13:59:51 2017 -0400

    snort2lua: added firewall to unsupported list

commit 1021f6d10712c290986356ffc2127e24d494dd70
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Fri Jul 28 13:36:33 2017 -0400

    snort2lua: added nap_selector to unsupported list

commit b8b058da7779c802b906813ba108cbaa10a3a11a
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Fri Jul 28 13:19:05 2017 -0400

    snort2lua: added sf_unified2 to unsupported list and matching log/alert to deleted.

commit e54a3faff40023cecc60ec8a58c502a241c94843
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Thu Jul 27 12:44:03 2017 -0400

    snort2lua: added config protected_content to deleted list

commit e54ec4b55d4dcdcf9d4164151860de2726cc0df7
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Wed Jul 26 12:44:42 2017 -0400

    snort2lua: added config_na_policy_mode to unsupported list

commit 88dd22b5999a6f673ea747bae36060e916321c52
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Tue Jul 25 10:02:33 2017 -0400

    snort2lua: added XFF configuration to unsupported list

commit f38d8334ba8de1e964daed54212b8d448d1408bf
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Fri Jul 28 09:58:40 2017 -0400

    snort2lua: added ability to add top level unsupported comments

commit f3a06388660ceb897d37b0d3527f005d1d5936b7
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Mon Jul 24 10:29:23 2017 -0400

    snort2lua: condensed failed_conversion to one method
25 files changed:
tools/snort2lua/config_states/CMakeLists.txt
tools/snort2lua/config_states/Makefile.am
tools/snort2lua/config_states/config_api.cc
tools/snort2lua/config_states/config_deleted.cc
tools/snort2lua/config_states/config_na_policy_mode.cc [new file with mode: 0644]
tools/snort2lua/conversion_state.h
tools/snort2lua/data/data_types/dt_comment.h
tools/snort2lua/data/dt_data.cc
tools/snort2lua/data/dt_data.h
tools/snort2lua/helpers/converter.cc
tools/snort2lua/keyword_states/CMakeLists.txt
tools/snort2lua/keyword_states/Makefile.am
tools/snort2lua/keyword_states/keywords_api.cc
tools/snort2lua/keyword_states/kws_deleted.cc [new file with mode: 0644]
tools/snort2lua/output_states/CMakeLists.txt
tools/snort2lua/output_states/Makefile.am
tools/snort2lua/output_states/out_deleted.cc [new file with mode: 0644]
tools/snort2lua/output_states/out_sfunified2.cc [new file with mode: 0644]
tools/snort2lua/output_states/output_api.cc
tools/snort2lua/preprocessor_states/CMakeLists.txt
tools/snort2lua/preprocessor_states/Makefile.am
tools/snort2lua/preprocessor_states/pps_firewall.cc [new file with mode: 0644]
tools/snort2lua/preprocessor_states/pps_http_inspect_server.cc
tools/snort2lua/preprocessor_states/pps_nap_selector.cc [new file with mode: 0644]
tools/snort2lua/preprocessor_states/preprocessor_api.cc