]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #2230 in SNORT/snort3 from ~OSERHIIE/snort3:trace_control_command...
authorBhagya Tholpady (bbantwal) <bbantwal@cisco.com>
Thu, 4 Jun 2020 17:13:03 +0000 (17:13 +0000)
committerBhagya Tholpady (bbantwal) <bbantwal@cisco.com>
Thu, 4 Jun 2020 17:13:03 +0000 (17:13 +0000)
commit2a508faf69d521f249b5ae90ef2ca98596490870
tree50e845dfb6120444d60dec3cbd9f5ef213f815a6
parent599e86a95e681a2b0292be27c946f820617d7b49
Merge pull request #2230 in SNORT/snort3 from ~OSERHIIE/snort3:trace_control_command to master

Squashed commit of the following:

commit ad8de0f3f4f5499eac67d3e0d9e8ab0391434308
Author: Oleksandr Serhiienko <oserhiie@cisco.com>
Date:   Fri May 29 13:07:54 2020 +0300

    trace: fix for trace messages in the test-mode ('-T' option)

commit e9e654d6301f4c81c8086d84581380432272299f
Author: Oleksandr Serhiienko <oserhiie@cisco.com>
Date:   Fri May 15 11:45:34 2020 +0300

    trace: add control channel command
14 files changed:
src/main/snort_config.cc
src/main/snort_config.h
src/trace/CMakeLists.txt
src/trace/dev_notes.txt
src/trace/trace.cc
src/trace/trace.h
src/trace/trace_config.cc
src/trace/trace_config.h
src/trace/trace_module.cc
src/trace/trace_module.h
src/trace/trace_parser.cc [new file with mode: 0644]
src/trace/trace_parser.h [new file with mode: 0644]
src/trace/trace_swap.cc [new file with mode: 0644]
src/trace/trace_swap.h [new file with mode: 0644]