]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #2037 in SNORT/snort3 from ~DAVMCPHE/snort3:nuking_reload_errors...
authorRuss Combs (rucombs) <rucombs@cisco.com>
Fri, 28 Feb 2020 04:12:34 +0000 (04:12 +0000)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Fri, 28 Feb 2020 04:12:34 +0000 (04:12 +0000)
commit9ee76016f1abe825d5ebcaa472a2651e89f88171
tree4ea4759d7886651e062d484b49aeb1d3eb06fcc0
parent072edee259cebbff312fa8f8ad04d896bf73e562
Merge pull request #2037 in SNORT/snort3 from ~DAVMCPHE/snort3:nuking_reload_errors to master

Squashed commit of the following:

commit 9d50248d9b1768509c9876ed3ed53a3c52cc8d91
Author: davis mcpherson <davmcphe@cisco.com>
Date:   Thu Feb 27 21:12:31 2020 -0500

    ghash: fix thread race condition with GHash member variables when a GHash instance is global

commit 8b7b0bab38e9d567e81acf784b39fe4eae4d6534
Author: davis mcpherson <davmcphe@cisco.com>
Date:   Mon Feb 10 17:24:28 2020 -0500

    snort_config: footprint REG_TEST, no check for stream inspector add/rm, etc

    reload: add description of reload error to the response message of the reload_config command

    ips_base64: add logic to call ips option tinit method on reload if not previously called

    hash: delete unused sfmemcap.[h|cc] and remove unnecessary includes
26 files changed:
src/file_api/file_module.cc
src/file_api/file_service.cc
src/hash/ghash.cc
src/hash/ghash.h
src/hash/hash_defs.h
src/hash/hash_key_operations.cc
src/hash/test/CMakeLists.txt
src/hash/xhash.cc
src/log/messages.cc
src/log/messages.h
src/main.cc
src/main/analyzer.cc
src/main/snort_config.cc
src/main/snort_config.h
src/managers/ips_manager.cc
src/managers/ips_manager.h
src/ports/port_object2.cc
src/service_inspectors/http2_inspect/http2_dummy_packet.h
src/stream/base/stream_base.cc
src/stream/base/stream_module.cc
src/stream/base/stream_module.h
src/stream/flush_bucket.cc
src/stream/flush_bucket.h
src/utils/CMakeLists.txt
src/utils/sfmemcap.cc [deleted file]
src/utils/sfmemcap.h [deleted file]