]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #1131 in SNORT/snort3 from perf_files to master
authorMichael Altizer (mialtize) <mialtize@cisco.com>
Tue, 13 Mar 2018 22:30:44 +0000 (18:30 -0400)
committerMichael Altizer (mialtize) <mialtize@cisco.com>
Tue, 13 Mar 2018 22:30:44 +0000 (18:30 -0400)
commit3db7df89448709356ebc13d5bdaf6d7ca2702cb5
tree41752407275bf29fc6285a44b7a414838ec71e93
parent0fc082fec49dd7ff039fda33ccb85dcaace2ae6b
Merge pull request #1131 in SNORT/snort3 from perf_files to master

Squashed commit of the following:

commit e6f3785c7af8aa67856fce0c9618165352fbda01
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Tue Mar 13 10:26:08 2018 -0400

    PluginManager: enforce all IT_PROBE Inspectors present GLOBAL Modules

commit e7470a81c44ecb506f8cb89cc77a72e95d3b65ba
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Tue Mar 13 09:50:15 2018 -0400

    ModuleManager: globals only load on default policy

commit 50edf8306b1127f1ff150ee9fb699ddbe65a4b6a
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Fri Mar 9 08:24:31 2018 -0500

    DataBus: added ability to unsubscribe to prevent dangling references

commit d60232178001c911176ed0272181f80a913bbe62
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Thu Mar 8 12:05:21 2018 -0500

    perf_monitor: fixed flow_ip outputting erroneous values

commit e003750bf325ed99a6b1186b839f1f40e569d21c
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Mon Feb 19 16:08:54 2018 -0500

    InspectorManager: probes run regardless of active policy

commit 3749d1380583fb2d3b475b76c741fd63bb28f061
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Mon Feb 19 15:30:12 2018 -0500

    perf_monitor: query modules for stats only after they have all loaded

commit dddb7fdd814513d4f195f501d6cff2f6b6dd6760
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Wed Feb 14 16:17:08 2018 -0500

    perf_monitor: decoupled from other modules. now builds dynamically.
28 files changed:
src/framework/data_bus.cc
src/framework/data_bus.h
src/main/policy.cc
src/main/policy.h
src/main/snort.cc
src/managers/inspector_manager.cc
src/managers/module_manager.cc
src/managers/plugin_manager.cc
src/network_inspectors/CMakeLists.txt
src/network_inspectors/network_inspectors.cc
src/network_inspectors/packet_capture/capture_module.h
src/network_inspectors/packet_capture/packet_capture.cc
src/network_inspectors/perf_monitor/CMakeLists.txt
src/network_inspectors/perf_monitor/base_tracker.cc
src/network_inspectors/perf_monitor/cpu_tracker.cc
src/network_inspectors/perf_monitor/flow_ip_tracker.cc
src/network_inspectors/perf_monitor/flow_ip_tracker.h
src/network_inspectors/perf_monitor/flow_tracker.cc
src/network_inspectors/perf_monitor/perf_module.cc
src/network_inspectors/perf_monitor/perf_module.h
src/network_inspectors/perf_monitor/perf_monitor.cc
src/network_inspectors/perf_monitor/perf_monitor.h [deleted file]
src/network_inspectors/perf_monitor/perf_tracker.cc
src/network_inspectors/perf_monitor/perf_tracker.h
src/network_inspectors/port_scan/ps_module.h
src/stream/tcp/tcp_debug_trace.h
src/stream/tcp/tcp_session.cc
src/stream/udp/udp_session.cc