Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[20120] TCPSendResources cleanup (backport #4300) #4511

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 5, 2024

This is an automatic backport of pull request #4300 done by Mergify.
Cherry-pick of fe11650 has failed:

On branch mergify/bp/2.11.x/pr-4300
Your branch is up to date with 'origin/2.11.x'.

You are currently cherry-picking commit fe116500c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/cpp/rtps/builtin/discovery/participant/PDP.cpp
	modified:   src/cpp/rtps/network/NetworkFactory.cpp
	modified:   src/cpp/rtps/network/NetworkFactory.h
	modified:   src/cpp/rtps/participant/RTPSParticipantImpl.cpp
	modified:   src/cpp/rtps/participant/RTPSParticipantImpl.h
	modified:   src/cpp/rtps/transport/UDPSenderResource.hpp
	modified:   src/cpp/rtps/transport/UDPTransportInterface.cpp
	modified:   src/cpp/rtps/transport/UDPTransportInterface.h
	modified:   test/blackbox/common/DatagramInjectionTransport.cpp
	modified:   test/blackbox/common/DatagramInjectionTransport.hpp
	modified:   test/mock/rtps/RTPSParticipantImpl/rtps/participant/RTPSParticipantImpl.h
	modified:   test/unittest/rtps/security/CMakeLists.txt
	deleted:    test/unittest/transport/test_UDPv4Tests.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/rtps/transport/TCPSenderResource.hpp
	both modified:   src/cpp/rtps/transport/TCPTransportInterface.cpp
	both modified:   src/cpp/rtps/transport/TCPTransportInterface.h
	both modified:   test/blackbox/common/BlackboxTestsTransportTCP.cpp
	both modified:   test/unittest/rtps/discovery/CMakeLists.txt
	both modified:   test/unittest/statistics/rtps/CMakeLists.txt
	both modified:   test/unittest/transport/CMakeLists.txt
	both modified:   test/unittest/transport/TCPv4Tests.cpp
	both modified:   test/unittest/transport/TCPv6Tests.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Refs #20120: Remove unused include

Signed-off-by: Jesus Perez <[email protected]>

* Refs #20120: TCP event call

Signed-off-by: Jesus Perez <[email protected]>

* Refs #20120: Sanitize transport

Signed-off-by: Jesus Perez <[email protected]>

* Refs #20120: Added tests and minor fixes

Signed-off-by: Jesus Perez <[email protected]>

* Refs #20120: Extended doxygen description and added to versions.md

Signed-off-by: Jesus Perez <[email protected]>

* Refs #20120: Uncrustify

Signed-off-by: Jesus Perez <[email protected]>

* Refs #20120: Add missing header

Signed-off-by: Jesus Perez <[email protected]>

* Refs #20120: Fix tests

Signed-off-by: Jesus Perez <[email protected]>

* Refs #20120: Uncrustify

Signed-off-by: Jesus Perez <[email protected]>

* Refs #20120: After client-server decision making rebase, not working

Signed-off-by: Jesus Perez <[email protected]>

* Refs #20120: Update

Signed-off-by: Jesus Perez <[email protected]>

* Refs #20120: Fix for chaining-transports

Signed-off-by: Jesus Perez <[email protected]>

* Refs #20120: Add new channel connection status and tests

Signed-off-by: Jesus Perez <[email protected]>

* Refs #20120: PR refactor, timed event deleted. cleanup on pdp unbinding

Signed-off-by: Jesus Perez <[email protected]>

* Refs #20120: Uncrustify

Signed-off-by: Jesus Perez <[email protected]>

* Refs #20120: Add unittests

Signed-off-by: Jesus Perez <[email protected]>

* Refs #20120: Fix deadlock

Signed-off-by: Jesus Perez <[email protected]>

* Refs #20120: Fix unittest

Signed-off-by: Jesus Perez <[email protected]>

* Refs #20120: Fix asio throwing exceptions

Signed-off-by: Jesus Perez <[email protected]>

* Refs #20120: Unnittest untab

Signed-off-by: Jesus Perez <[email protected]>

* Refs #20120: Apply suggestions

Signed-off-by: Jesus Perez <[email protected]>

* Refs #20120: Uncrustify

Signed-off-by: Jesus Perez <[email protected]>

* Refs #20120: Consider wan case + associated tests

Signed-off-by: Jesus Perez <[email protected]>

* Refs #20120: Remove versions.md update

Signed-off-by: Jesus Perez <[email protected]>

* Refs #20120: Fix rebasing wrong deletion

Signed-off-by: Jesus Perez <[email protected]>

* Refs #20120: Delete assert clause

Signed-off-by: Jesus Perez <[email protected]>

* Refs #20120: Apply suggestions

Signed-off-by: EduPonz <[email protected]>

---------

Signed-off-by: Jesus Perez <[email protected]>
Signed-off-by: EduPonz <[email protected]>
Co-authored-by: EduPonz <[email protected]>
(cherry picked from commit fe11650)

# Conflicts:
#	src/cpp/rtps/transport/TCPSenderResource.hpp
#	src/cpp/rtps/transport/TCPTransportInterface.cpp
#	src/cpp/rtps/transport/TCPTransportInterface.h
#	test/blackbox/common/BlackboxTestsTransportTCP.cpp
#	test/unittest/rtps/discovery/CMakeLists.txt
#	test/unittest/statistics/rtps/CMakeLists.txt
#	test/unittest/transport/CMakeLists.txt
#	test/unittest/transport/TCPv4Tests.cpp
#	test/unittest/transport/TCPv6Tests.cpp
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Mar 5, 2024
Copy link
Contributor Author

mergify bot commented Mar 5, 2024

Cherry-pick of fe11650 has failed:

On branch mergify/bp/2.11.x/pr-4300
Your branch is up to date with 'origin/2.11.x'.

You are currently cherry-picking commit fe116500c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/cpp/rtps/builtin/discovery/participant/PDP.cpp
	modified:   src/cpp/rtps/network/NetworkFactory.cpp
	modified:   src/cpp/rtps/network/NetworkFactory.h
	modified:   src/cpp/rtps/participant/RTPSParticipantImpl.cpp
	modified:   src/cpp/rtps/participant/RTPSParticipantImpl.h
	modified:   src/cpp/rtps/transport/UDPSenderResource.hpp
	modified:   src/cpp/rtps/transport/UDPTransportInterface.cpp
	modified:   src/cpp/rtps/transport/UDPTransportInterface.h
	modified:   test/blackbox/common/DatagramInjectionTransport.cpp
	modified:   test/blackbox/common/DatagramInjectionTransport.hpp
	modified:   test/mock/rtps/RTPSParticipantImpl/rtps/participant/RTPSParticipantImpl.h
	modified:   test/unittest/rtps/security/CMakeLists.txt
	deleted:    test/unittest/transport/test_UDPv4Tests.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/rtps/transport/TCPSenderResource.hpp
	both modified:   src/cpp/rtps/transport/TCPTransportInterface.cpp
	both modified:   src/cpp/rtps/transport/TCPTransportInterface.h
	both modified:   test/blackbox/common/BlackboxTestsTransportTCP.cpp
	both modified:   test/unittest/rtps/discovery/CMakeLists.txt
	both modified:   test/unittest/statistics/rtps/CMakeLists.txt
	both modified:   test/unittest/transport/CMakeLists.txt
	both modified:   test/unittest/transport/TCPv4Tests.cpp
	both modified:   test/unittest/transport/TCPv6Tests.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot mentioned this pull request Mar 5, 2024
12 tasks
@JesusPoderoso
Copy link
Contributor

Closing this backport as long as 2.11.x is EOL

@mergify mergify bot deleted the mergify/bp/2.11.x/pr-4300 branch March 6, 2024 06:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts Backport PR wich git cherry pick failed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants