]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #1545 in SNORT/snort3 from ~CWAXMAN/snort3:rule_state to master
authorMichael Altizer (mialtize) <mialtize@cisco.com>
Fri, 29 Mar 2019 15:32:49 +0000 (11:32 -0400)
committerMichael Altizer (mialtize) <mialtize@cisco.com>
Fri, 29 Mar 2019 15:32:49 +0000 (11:32 -0400)
commit192cdfc83d71bfdc1433f56117cc5c83b6982f4b
treebb439f5ed16ff4fafd77273da224c1e93aaabd88
parente9e92ede5c621a352197f20a4f706d73e6ba3ec7
Merge pull request #1545 in SNORT/snort3 from ~CWAXMAN/snort3:rule_state to master

Squashed commit of the following:

commit 323e859c920a3edbb522200a408a47aaabb74e34
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Tue Mar 12 15:21:40 2019 -0400

    detection, snort2lua: added global rule state options for legacy conversions

commit b5cb6f3f9a17fb2df26c86475e305946edaaef5c
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Fri Mar 8 15:36:25 2019 -0500

    detection: fixed incorrect log messages

commit eb438448160d41867d5e68a890cea627a04c88fb
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Tue Feb 26 08:28:52 2019 -0500

    rule_state: added default rule state to ips policy

commit 6eec505eb1af7357584eb7a18a49fde409b5e1a3
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Mon Feb 25 15:41:08 2019 -0500

    rule_state: add rtn but disable if block is set on non-inline deployment

commit 52b20be073639ba0f1b75a0943c6b595f81b7318
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Mon Feb 18 12:27:48 2019 -0500

    rule_state: added per-ips-policy rule states
29 files changed:
src/actions/actions.h
src/detection/CMakeLists.txt
src/detection/fp_create.cc
src/detection/fp_detect.cc
src/detection/rtn_checks.cc
src/detection/rules.cc [new file with mode: 0644]
src/detection/rules.h
src/detection/service_map.cc
src/detection/signature.cc
src/detection/signature.h
src/detection/treenodes.h
src/framework/parameter.h
src/ips_options/ips_flow.cc
src/main/modules.cc
src/main/policy.h
src/main/snort_config.cc
src/main/snort_config.h
src/managers/module_manager.cc
src/parser/parse_conf.cc
src/parser/parse_conf.h
src/parser/parse_rule.cc
src/parser/parser.cc
tools/snort2lua/config_states/config_default_rule_state.cc
tools/snort2lua/data/data_types/dt_table.cc
tools/snort2lua/data/data_types/dt_table.h
tools/snort2lua/data/dt_table_api.cc
tools/snort2lua/data/dt_table_api.h
tools/snort2lua/helpers/converter.cc
tools/snort2lua/keyword_states/kws_rule_state.cc