]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #578 in SNORT/snort3 from ha-sc-tcp to master
authorTom Peters (thopeter) <thopeter@cisco.com>
Tue, 23 Aug 2016 17:31:17 +0000 (13:31 -0400)
committerTom Peters (thopeter) <thopeter@cisco.com>
Tue, 23 Aug 2016 17:31:17 +0000 (13:31 -0400)
commit19aa43f5e6a779b420b2b1d537389b928027ab3e
treedd62894df2f88292aafc684afa9c18e5aa5db5f6
parent83d3a772e35cc88a4675c40bad6963b4fefc5e15
Merge pull request #578 in SNORT/snort3 from ha-sc-tcp to master

Squashed commit of the following:

commit 0652444c0ea2a17935c5d82cc2d934e73f19d742
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Fri Aug 19 07:08:28 2016 -0400

    Removed reference to POLLRDHUP.

commit fb39de92698a0162923315b7d314504b64c672fa
Merge: 6bca045 6255c61
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Fri Aug 19 06:49:14 2016 -0400

    Merge branch 'ha-sc-tcp' of https://bitbucket-eng-rtp1.cisco.com/bitbucket/scm/snort/snort3 into ha-sc-tcp

commit 6bca045aa2aa55a184bc8f77efeb81ec61f6c402
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Tue Aug 16 19:38:02 2016 -0400

    Update target code and UT's to disable receive thread for testing.

commit 248c51ed08280b21dcca61212747f99195633c63
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Mon Aug 15 16:15:17 2016 -0400

    UT update.

commit 56bdab304cbf99e5a56337da853f8c50406e54ed
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Mon Aug 15 15:46:29 2016 -0400

    Updates from code review.

commit 62b2ab8387c8b395bc2a72cab386070c5a6f9620
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Thu Aug 11 16:41:00 2016 -0400

    Disable memory leak detection in CppUtest as it sometimes indicates a false positive under ASAN.

commit 6b7dcac104018dd4643ddde1b1c66cf32a6e573b
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Thu Aug 11 15:29:19 2016 -0400

    Additional tcp_connector UT's

commit 9e0c8e9017ab8527d620faf3488215b8cca7c3d9
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Thu Aug 11 08:12:48 2016 -0400

    Restore some mods that were reverted, but shouldn't have been..

commit ad105545bda657e12b6df3af98a6317b45439730
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Wed Aug 10 07:34:26 2016 -0400

    Revert "Additional UT's.  Fix one memory leak scenario in tcp_connector.cc"

    This reverts commit e590395e2e5e12dc024d860285056ad31ad7c3c8.

commit 56e5c6fa3463a886a312860c0374e7750ec4990a
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Wed Aug 10 07:34:02 2016 -0400

    Revert "Fix an ASAN finding in UT."

    This reverts commit bc8b83c44f9307eba521bb4694d078f88cf9e50e.

commit 373986e3ecae80345d52780344766473e2a190ce
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Wed Aug 10 07:19:16 2016 -0400

    Fix an ASAN finding in UT.

commit 03d7bd67e852c2dda9748651f8cf564af085289c
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Wed Aug 10 06:46:45 2016 -0400

    Additional UT's.  Fix one memory leak scenario in tcp_connector.cc

commit 68f3435ba9025bc210a008c424d379925df6584a
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Fri Aug 5 16:18:29 2016 -0400

    Additional UT's

commit beb32f995e766ff640beb7f47d40c0eef0375398
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Thu Aug 4 14:49:19 2016 -0400

    Changed from ConcurrentQueue<> to Ring<> for the TcpConnector receiver.

commit ca343728fb6f86eeddfb140466bf51054a549cb5
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Thu Aug 4 07:06:31 2016 -0400

    Fix error in cmake build.

commit 423f603c0418d845320dfffc9f046ac51fa3a3e6
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Wed Aug 3 17:10:47 2016 -0400

    Remove a few remnants of legacy code.

commit 549c4568e04078259a31e73a5f2deaff532730ac
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Wed Aug 3 17:05:56 2016 -0400

    Fix a printf format warning ieeue.

commit c0649eab8e858a1f8a52650e6d1060671207a016
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Tue Aug 2 14:56:37 2016 -0400

    Fix memory leak with thread object.

commit fdf2577b7efd40c0796d3758b6e7bad1f39c36d4
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Tue Aug 2 12:04:04 2016 -0400

    Fix a thread shutdown issue.

commit 34b29a0fb66b3802ace70bfa218ab32e7b9a9b34
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Tue Jul 5 10:00:42 2016 -0400

    tcp_connector.

    Updates for TCP HA.  Fixes for functional tests. Refactoring for work on tcp_connector.

    Memory leak fix.

    Updates for TCP HA.  Fixes for functional tests. Refactoring for work on tcp_connector.

    tcp_connector

commit 2fb93265418a749fe284d4820a7a3f6e91fcc746
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Tue Jul 5 10:00:42 2016 -0400

    Updates for TCP HA.  Fixes for functional tests. Refactoring for work on tcp_connector.

    Memory leak fix.

commit 6085ac02479156030c8d7921e8a2d00b4f642790
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Tue Jul 5 10:00:42 2016 -0400

    Updates for TCP HA.  Fixes for functional tests. Refactoring for work on tcp_connector.

commit 6255c610cad1dc554bf36a47711f6ab47e393b6c
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Tue Aug 16 19:38:02 2016 -0400

    Update target code and UT's to disable receive thread for testing.

commit 876493c83b38442ed91346bb2ebb46611a727844
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Mon Aug 15 16:15:17 2016 -0400

    UT update.

commit 0c7025514146f4d6ece7da1dc94c02da6a50190d
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Mon Aug 15 15:46:29 2016 -0400

    Updates from code review.

commit b4359b6dc39498241faebcd586b5783f90c9b6c3
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Thu Aug 11 16:41:00 2016 -0400

    Disable memory leak detection in CppUtest as it sometimes indicates a false positive under ASAN.

commit dd2b2b4971766d4779d28aefba1403f627f37fb7
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Thu Aug 11 15:29:19 2016 -0400

    Additional tcp_connector UT's

commit 2c13c0c3ab1bc369cea2e5632f0d1dd42bf49f79
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Thu Aug 11 08:12:48 2016 -0400

    Restore some mods that were reverted, but shouldn't have been..

commit 92b440ff76eddc35352e87f341275671c81ddccf
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Wed Aug 10 07:34:26 2016 -0400

    Revert "Additional UT's.  Fix one memory leak scenario in tcp_connector.cc"

    This reverts commit e590395e2e5e12dc024d860285056ad31ad7c3c8.

commit 919da30a29b855159be36967e7aa88ec2c24d997
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Wed Aug 10 07:34:02 2016 -0400

    Revert "Fix an ASAN finding in UT."

    This reverts commit bc8b83c44f9307eba521bb4694d078f88cf9e50e.

commit bc8b83c44f9307eba521bb4694d078f88cf9e50e
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Wed Aug 10 07:19:16 2016 -0400

    Fix an ASAN finding in UT.

commit e590395e2e5e12dc024d860285056ad31ad7c3c8
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Wed Aug 10 06:46:45 2016 -0400

    Additional UT's.  Fix one memory leak scenario in tcp_connector.cc

commit 1c8e424562402734dc7fa6a28ccdaece6f1c587a
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Fri Aug 5 16:18:29 2016 -0400

    Additional UT's

commit 8bd056e9a0890b63a3c4cfc0922259970235c186
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Thu Aug 4 14:49:19 2016 -0400

    Changed from ConcurrentQueue<> to Ring<> for the TcpConnector receiver.

commit 14788fdb755badf13bc2f7334ce2643b7e1b19ae
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Thu Aug 4 07:06:31 2016 -0400

    Fix error in cmake build.

commit e811e6f268a6a9c6538ed9cc29ca3f960c6c11d2
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Wed Aug 3 17:10:47 2016 -0400

    Remove a few remnants of legacy code.

commit 46e335cacad11e6a96c8e3ec93eb356735b565d3
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Wed Aug 3 17:05:56 2016 -0400

    Fix a printf format warning ieeue.

commit 0a7c43c4cfe06ae042c8399208bea915fb274096
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Tue Aug 2 14:56:37 2016 -0400

    Fix memory leak with thread object.

commit 71899da94897aff8c25ed49567d0542842178ee7
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Tue Aug 2 12:04:04 2016 -0400

    Fix a thread shutdown issue.

commit 56cc2f720c4e77fbb42d9be00c9ccaa7bd118b0a
Merge: 571bc99 4d80af3
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Tue Aug 2 08:58:47 2016 -0400

    Merge branch 'ha-sc-tcp' of https://bitbucket-eng-rtp1.cisco.com/bitbucket/scm/snort/snort3 into ha-sc-tcp

commit 571bc99914d0fa3002990a2f58820f6c3f05950f
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Tue Jul 5 10:00:42 2016 -0400

    tcp_connector.

    Updates for TCP HA.  Fixes for functional tests. Refactoring for work on tcp_connector.

    Memory leak fix.

    Updates for TCP HA.  Fixes for functional tests. Refactoring for work on tcp_connector.

    tcp_connector

commit 4d80af36f33a30360a5e0ea506feb5e30e61ea8b
Merge: f61f12c 0f6c19d
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Thu Jul 7 07:35:38 2016 -0400

    Merge branch 'ha-sc-tcp' of https://bitbucket-eng-rtp1.cisco.com/bitbucket/scm/snort/snort3 into ha-sc-tcp

commit f61f12c51c806dc9097ccf4b1afb831a51e6792c
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Tue Jul 5 10:00:42 2016 -0400

    Updates for TCP HA.  Fixes for functional tests. Refactoring for work on tcp_connector.

    Memory leak fix.

commit 0f6c19d80d40de163c4a5c8460c140db836df386
Author: Ed Borgoyn <eborgoyn@cisco.com>
Date:   Tue Jul 5 10:00:42 2016 -0400

    Updates for TCP HA.  Fixes for functional tests. Refactoring for work on tcp_connector.
46 files changed:
configure.ac
src/Makefile.am
src/connectors/CMakeLists.txt
src/connectors/Makefile.am
src/connectors/connectors.cc
src/connectors/file_connector/file_connector.cc
src/connectors/file_connector/file_connector.h
src/connectors/file_connector/file_connector_config.h
src/connectors/tcp_connector/CMakeLists.txt [new file with mode: 0644]
src/connectors/tcp_connector/Makefile.am [new file with mode: 0644]
src/connectors/tcp_connector/dev_notes.txt [new file with mode: 0644]
src/connectors/tcp_connector/tcp_connector.cc [new file with mode: 0644]
src/connectors/tcp_connector/tcp_connector.h [new file with mode: 0644]
src/connectors/tcp_connector/tcp_connector_config.h [new file with mode: 0644]
src/connectors/tcp_connector/tcp_connector_module.cc [new file with mode: 0644]
src/connectors/tcp_connector/tcp_connector_module.h [new file with mode: 0644]
src/connectors/tcp_connector/test/CMakeLists.txt [new file with mode: 0644]
src/connectors/tcp_connector/test/Makefile.am [new file with mode: 0644]
src/connectors/tcp_connector/test/tcp_connector_module_test.cc [new file with mode: 0644]
src/connectors/tcp_connector/test/tcp_connector_test.cc [new file with mode: 0644]
src/flow/flow.cc
src/flow/flow.h
src/flow/flow_cache.cc
src/flow/flow_control.cc
src/flow/ha.cc
src/flow/ha.h
src/framework/connector.h
src/main/snort.cc
src/network_inspectors/binder/binder.cc
src/network_inspectors/reputation/reputation_inspect.cc
src/packet_io/active.cc
src/side_channel/side_channel.cc
src/side_channel/side_channel_module.cc
src/side_channel/test/side_channel_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/ip/ip_ha.cc
src/stream/ip/ip_ha.h
src/stream/stream_api.cc
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