]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #704 in SNORT/snort3 from threadz to master
authorRuss Combs (rucombs) <rucombs@cisco.com>
Mon, 14 Nov 2016 19:47:41 +0000 (14:47 -0500)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Mon, 14 Nov 2016 19:47:41 +0000 (14:47 -0500)
commit26a6979a2b147f676ea75346b7e4b4b1c640de75
tree5902ed1a444b7254a15a795b2e27ad67dd8badf9
parentfd7abc18797aa3054f8f780952b351e4a92cd60b
Merge pull request #704 in SNORT/snort3 from threadz to master

Squashed commit of the following:

commit cbdc3439b7140d2368fb2b8b68cd07ed19d31f23
Author: Russ Combs <rucombs@cisco.com>
Date:   Mon Nov 14 12:52:48 2016 -0500

    convert file capture stats to module based thread locals

commit 2883836a3381d3ba47ebe852b129bb8124b6371d
Author: Russ Combs <rucombs@cisco.com>
Date:   Mon Nov 14 07:55:24 2016 -0500

    convert file stats to module based thread locals

commit 67be0d6fb4e795731559682df0d8cac6aa406a98
Author: Russ Combs <rucombs@cisco.com>
Date:   Sun Nov 13 08:19:46 2016 -0500

    fix most reload race conditions

commit fe87e6793ae4d05f1be925762973949a4788590e
Author: Russ Combs <rucombs@cisco.com>
Date:   Fri Nov 11 17:44:28 2016 -0500

    comment on atomic switching
    comment on test scope

commit 728f5faa707c0f02c860f94774d7a80947c8335f
Author: Russ Combs <rucombs@cisco.com>
Date:   Fri Nov 11 10:47:22 2016 -0500

    fix dynamic builds and unit tests

commit ad834007ff90c420bb2ab1be7e4c59473210ca5f
Author: Russ Combs <rucombs@cisco.com>
Date:   Fri Nov 11 08:15:57 2016 -0500

    move file trace flags into file config

commit 705a36bc7beebd00eea5869f1f1da1bf896bb44b
Author: Russ Combs <rucombs@cisco.com>
Date:   Fri Nov 11 07:31:02 2016 -0500

    fix stats races

commit ac9dbfb785111836aeb634bede4f3362d247704c
Author: Russ Combs <rucombs@cisco.com>
Date:   Thu Nov 10 11:14:15 2016 -0500

    fix most stats races

commit 3b3412632f8c82f3e968be99d0b9b02fa238a6ec
Author: Russ Combs <rucombs@cisco.com>
Date:   Thu Nov 10 07:18:29 2016 -0500

    fix max_pdu race cond

commit abf9b805082cc2916eff49b8c823ef3fb0645d18
Author: Russ Combs <rucombs@cisco.com>
Date:   Thu Nov 10 06:57:33 2016 -0500

    fix data race with swap pointer

commit d2449a2c48237405030ef06c829c7eec29f6c1d0
Author: Russ Combs <rucombs@cisco.com>
Date:   Wed Nov 9 21:14:33 2016 -0500

    fix thread sanitizer issues with legacy protocol reference table

commit 64a66d296174d104e6163ebcd7edc116223d1c3a
Author: Russ Combs <rucombs@cisco.com>
Date:   Wed Nov 9 07:31:52 2016 -0500

    fix ownership of stream module config

commit d3e27d8afe04e126dc2caec3350f8b1a27a3ad1a
Author: Russ Combs <rucombs@cisco.com>
Date:   Wed Nov 9 07:30:28 2016 -0500

    fix packet thread startup data races
49 files changed:
src/detection/fp_create.cc
src/detection/service_map.cc
src/detection/service_map.h
src/file_api/file_cache.cc
src/file_api/file_cache.h
src/file_api/file_capture.cc
src/file_api/file_capture.h
src/file_api/file_config.h
src/file_api/file_flows.cc
src/file_api/file_lib.cc
src/file_api/file_module.cc
src/file_api/file_module.h
src/file_api/file_service.cc
src/file_api/file_service.h
src/file_api/file_stats.cc
src/file_api/file_stats.h
src/helpers/swapper.h
src/host_tracker/host_cache.cc
src/host_tracker/host_tracker_module.cc
src/host_tracker/test/host_tracker_module_test.cc
src/main.cc
src/main/analyzer.cc
src/main/analyzer.h
src/main/modules.cc
src/main/snort.cc
src/main/snort_config.cc
src/main/snort_config.h
src/main/snort_module.cc
src/managers/inspector_manager.cc
src/managers/module_manager.cc
src/network_inspectors/appid/appid_session.cc
src/network_inspectors/appid/service_plugins/service_util.h
src/network_inspectors/binder/binder.cc
src/network_inspectors/binder/test/binder_test.cc
src/network_inspectors/perf_monitor/perf_tracker.cc
src/parser/parse_conf.cc
src/parser/parse_rule.cc
src/service_inspectors/ftp_telnet/ftp.cc
src/stream/base/stream_base.cc
src/stream/base/stream_module.cc
src/stream/base/stream_module.h
src/stream/stream_splitter.cc
src/stream/stream_splitter.h
src/stream/tcp/stream_tcp.cc
src/target_based/sftarget_reader.cc
src/target_based/snort_protocols.cc
src/target_based/snort_protocols.h
src/utils/stats.cc
src/utils/stats.h