]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #2181 in SNORT/snort3 from ~RUCOMBS/snort3:more_meta to master
authorRuss Combs (rucombs) <rucombs@cisco.com>
Tue, 28 Apr 2020 14:52:46 +0000 (14:52 +0000)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Tue, 28 Apr 2020 14:52:46 +0000 (14:52 +0000)
commit49af2b2c52ef9a69bf798ef95839c0aeb767e102
tree1c5aebddab01cf1397c3a1fb556bc04e94bb9278
parent039b3c4ce623e5156799ef72ac27f82b5980cc16
Merge pull request #2181 in SNORT/snort3 from ~RUCOMBS/snort3:more_meta to master

Squashed commit of the following:

commit aac87fdd266361917e23a8f4490eaadbdd4a72b7
Author: russ <rucombs@cisco.com>
Date:   Sat Apr 25 12:20:02 2020 -0400

    so rules: allow #fragments in references in so rule stubs

    Disallow # comments within so rule stub options since #frags in
    references were interpreted as comments.  Need to refactor the main
    parser to support this case.

commit 41e61ea2f0639ff68fd85e4989d4e5b83b40dc60
Author: russ <rucombs@cisco.com>
Date:   Fri Apr 24 17:28:52 2020 -0400

    parameter: reject reals assigned to ints

commit f7b6c8b83ec5609f92d4b270a3d4c53db064cd6b
Author: russ <rucombs@cisco.com>
Date:   Wed Apr 22 16:46:38 2020 -0400

    snort: convert --dump-rule-{meta,state,deps} to json format

commit 113228ee427c78785959445c2e56eb376c0e5478
Author: russ <rucombs@cisco.com>
Date:   Thu Apr 23 09:46:12 2020 -0400

    json: add stream formatter helper

commit 5a47d3ea423fe3dccdd7045b603fbfae01a09250
Author: russ <rucombs@cisco.com>
Date:   Wed Apr 22 13:06:31 2020 -0400

    snort: add classtype, priority, and references to --dump-rule-meta output
src/detection/signature.cc
src/framework/parameter.cc
src/helpers/CMakeLists.txt
src/helpers/json_stream.cc [new file with mode: 0644]
src/helpers/json_stream.h [new file with mode: 0644]
src/helpers/test/CMakeLists.txt
src/helpers/test/json_stream_test.cc [new file with mode: 0644]
src/managers/ips_manager.cc
src/parser/parse_so_rule.cc