]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #1619 in SNORT/snort3 from ~MIALTIZE/snort3:ha_daq to master
authorMichael Altizer (mialtize) <mialtize@cisco.com>
Wed, 12 Jun 2019 03:31:44 +0000 (23:31 -0400)
committerMichael Altizer (mialtize) <mialtize@cisco.com>
Wed, 12 Jun 2019 03:31:44 +0000 (23:31 -0400)
commit728c88e59013c67ade9a009f488438bfcf874bcf
treeddc3aa501dc866283a18009e5171f7d6f5627c4d
parent0d71d1daae52e413e9653ae1207c38281b567de7
Merge pull request #1619 in SNORT/snort3 from ~MIALTIZE/snort3:ha_daq to master

Squashed commit of the following:

commit 5aacc37644226329a02dc2637093c457614b351d
Author: Michael Altizer <mialtize@cisco.com>
Date:   Mon Jun 10 17:43:32 2019 -0400

    flow: Implement storing and importing HA data via DAQ IOCTLs

    This involved significant refactoring of the Flow HA code and added many
    peg counts to the module.  Export FlowHAClient, HighAvailabilityManager,
    and FlowHAState in flow/ha.h.  Specify that HA time parameters are in
    seconds.  The useless HA module unit tests were removed in the process.

commit 9fec6bc1993d35969c9aca4198ec0865ef7597e5
Author: Michael Altizer <mialtize@cisco.com>
Date:   Fri Jun 7 14:32:18 2019 -0400

    check: Fix missing semicolons on CHECK calls

commit fb6e8988fd3790f54c790110150b965a3abb456b
Author: Michael Altizer <mialtize@cisco.com>
Date:   Tue May 28 12:30:33 2019 -0400

    build: Fix unused parameter warnings in unit tests
41 files changed:
src/flow/CMakeLists.txt
src/flow/dev_notes.txt
src/flow/flow.cc
src/flow/flow.h
src/flow/flow_control.cc
src/flow/ha.cc
src/flow/ha.h
src/flow/ha_module.cc
src/flow/ha_module.h
src/flow/test/CMakeLists.txt
src/flow/test/flow_stash_test.cc
src/flow/test/ha_module_test.cc [deleted file]
src/flow/test/ha_test.cc
src/main/analyzer.cc
src/main/snort.cc
src/main/snort_config.cc
src/main/snort_config.h
src/network_inspectors/appid/test/appid_debug_test.cc
src/network_inspectors/appid/test/appid_discovery_test.cc
src/network_inspectors/appid/test/appid_mock_flow.h
src/network_inspectors/appid/test/appid_session_api_test.cc
src/network_inspectors/appid/test/service_state_test.cc
src/service_inspectors/sip/test/sip_splitter_test.cc
src/stream/base/stream_ha.cc
src/stream/base/stream_ha.h
src/stream/icmp/icmp_ha.cc
src/stream/icmp/icmp_ha.h
src/stream/icmp/icmp_session.cc
src/stream/ip/ip_ha.cc
src/stream/ip/ip_ha.h
src/stream/ip/ip_session.cc
src/stream/libtcp/stream_tcp_unit_test.cc
src/stream/libtcp/tcp_stream_session.cc
src/stream/stream.cc
src/stream/stream.h
src/stream/tcp/tcp_ha.cc
src/stream/tcp/tcp_ha.h
src/stream/tcp/tcp_session.cc
src/stream/udp/udp_ha.cc
src/stream/udp/udp_ha.h
src/stream/udp/udp_session.cc