[20238] Enabling multiple interfaces through whitelist in TCP servers (backport #4297)
This is an automatic backport of pull request #4297 done by Mergify. Cherry-pick of 5f65a65196dff2453ff86df711db018fefed1e54 has failed:
On branch mergify/bp/2.6.x/pr-4297
Your branch is up to date with 'origin/2.6.x'.
You are currently cherry-picking commit 5f65a6519.
(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/transport/TCPTransportInterface.cpp
Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)
both modified: test/unittest/transport/TCPv4Tests.cpp
both modified: test/unittest/transport/TCPv6Tests.cpp
both modified: test/unittest/transport/mock/MockTCPv4Transport.h
deleted by us: test/unittest/transport/mock/MockTCPv6Transport.h
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
@cferreiragonz friendly pinging here also. Remember to rebase also
- Merge after https://github.com/eProsima/Fast-DDS/pull/4386
- Ipv6 is out of scope from this branch. This feature will only be applied to Ipv4.
@cferreiragonz would you mind addressing the conflicts here ? Next one in the loop !
@richiprosima please test this
@richiprosima please test mac
@richiprosima please test mac
@richiprosima please test mac
@richiprosima please test mac
@richiprosima please test mac
@richiprosima please test mac
@richiprosima please test mac
Failed tests are totally unrelated to this PR, since they are not TCP related. We are not waiting for jenkins mac ci. Ready to merge