Fast-DDS
Fast-DDS copied to clipboard
[20120] TCPSendResources cleanup (backport #4300)
This is an automatic backport of pull request #4300 done by Mergify. Cherry-pick of fe116500cbfd873964f47033630c07001a76bbce has failed:
On branch mergify/bp/2.13.x/pr-4300
Your branch is up to date with 'origin/2.13.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/TCPSenderResource.hpp
modified: src/cpp/rtps/transport/TCPTransportInterface.cpp
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/discovery/CMakeLists.txt
modified: test/unittest/rtps/security/CMakeLists.txt
modified: test/unittest/statistics/rtps/CMakeLists.txt
modified: test/unittest/transport/CMakeLists.txt
modified: test/unittest/transport/TCPv6Tests.cpp
deleted: test/unittest/transport/test_UDPv4Tests.cpp
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: src/cpp/rtps/transport/TCPTransportInterface.h
both modified: test/blackbox/common/BlackboxTestsTransportTCP.cpp
both modified: test/unittest/transport/TCPv4Tests.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 refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill 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
Cherry-pick of fe116500cbfd873964f47033630c07001a76bbce has failed:
On branch mergify/bp/2.13.x/pr-4300
Your branch is up to date with 'origin/2.13.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/TCPSenderResource.hpp
modified: src/cpp/rtps/transport/TCPTransportInterface.cpp
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/discovery/CMakeLists.txt
modified: test/unittest/rtps/security/CMakeLists.txt
modified: test/unittest/statistics/rtps/CMakeLists.txt
modified: test/unittest/transport/CMakeLists.txt
modified: test/unittest/transport/TCPv6Tests.cpp
deleted: test/unittest/transport/test_UDPv4Tests.cpp
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: src/cpp/rtps/transport/TCPTransportInterface.h
both modified: test/blackbox/common/BlackboxTestsTransportTCP.cpp
both modified: test/unittest/transport/TCPv4Tests.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
@richiprosima please test this
@richiprosima please test linux
@mergifyio rebase
rebase
✅ Branch has been successfully rebased
@richiprosima please test this