git.ipfire.org Git - thirdparty/snort3.git/commit

]> git.ipfire.org Git - thirdparty/snort3.git/commit

projects / thirdparty / snort3.git / commit

author	Bhagya Tholpady (bbantwal) <bbantwal@cisco.com>
	Wed, 19 Aug 2020 20:27:13 +0000 (20:27 +0000)
committer	Bhagya Tholpady (bbantwal) <bbantwal@cisco.com>
	Wed, 19 Aug 2020 20:27:13 +0000 (20:27 +0000)
commit	8be856bb5d8ed535e30b35aadae3c841a169f19e
tree	67051658b9e8b12a25c4ef41c2a7cebe2144ceaa	tree
parent	0f17710530e1de2d1428cd080f503dcbabd7a1a5	commit \| diff

Merge pull request #2382 in SNORT/snort3 from ~SVLASIUK/snort3:dump_config_json to master

Squashed commit of the following:

commit bcba018627626465fbb8f55dacab8a6856690da3
Author: Serhii Vlasiuk <svlasiuk@cisco.com>
Date:   Thu Aug 6 14:34:18 2020 +0300

    dump_config: dump config in JSON format to stdout

    add new command-line option --dump-config=all to dump
    the config in JSON format

commit 67b5defe6f7a132ff62d2bd278364476cefe372c
Author: Oleksii Khomiakovskyi <okhomiak@cisco.com>
Date:   Wed Aug 5 17:13:33 2020 +0300

    helpers: add unit tests for special characters escaping

30 files changed:

src/CMakeLists.txt		diff \| blob \| blame \| history
src/detection/fp_create.cc		diff \| blob \| blame \| history
src/dump_config/CMakeLists.txt	[new file with mode: 0644]	blob
src/dump_config/config_data.cc	[new file with mode: 0644]	blob
src/dump_config/config_data.h	[moved from src/main/config_tree.h with 74% similarity]	diff \| blob \| blame \| history
src/dump_config/config_output.cc	[new file with mode: 0644]	blob
src/dump_config/config_output.h	[new file with mode: 0644]	blob
src/dump_config/dev_notes.txt	[new file with mode: 0644]	blob
src/dump_config/json_config_output.cc	[new file with mode: 0644]	blob
src/dump_config/json_config_output.h	[new file with mode: 0644]	blob
src/dump_config/text_config_output.cc	[moved from src/main/config_tree.cc with 51% similarity]	diff \| blob \| blame \| history
src/dump_config/text_config_output.h	[new file with mode: 0644]	blob
src/framework/value.cc		diff \| blob \| blame \| history
src/framework/value.h		diff \| blob \| blame \| history
src/helpers/test/json_stream_test.cc		diff \| blob \| blame \| history
src/log/messages.cc		diff \| blob \| blame \| history
src/log/messages.h		diff \| blob \| blame \| history
src/main.cc		diff \| blob \| blame \| history
src/main/CMakeLists.txt		diff \| blob \| blame \| history
src/main/dev_notes.txt		diff \| blob \| blame \| history
src/main/shell.cc		diff \| blob \| blame \| history
src/main/shell.h		diff \| blob \| blame \| history
src/main/snort.cc		diff \| blob \| blame \| history
src/main/snort_config.cc		diff \| blob \| blame \| history
src/main/snort_config.h		diff \| blob \| blame \| history
src/main/snort_module.cc		diff \| blob \| blame \| history
src/managers/module_manager.cc		diff \| blob \| blame \| history
src/parser/parser.cc		diff \| blob \| blame \| history
src/trace/trace_module.cc		diff \| blob \| blame \| history
src/trace/trace_swap.cc		diff \| blob \| blame \| history

Mirror of https://github.com/snort3/snort3.git

RSS Atom