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

[20238] Enabling multiple interfaces through whitelist in TCP servers (backport #4297) #4412

Merged
merged 1 commit into from
Mar 13, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 21, 2024

This is an automatic backport of pull request #4297 done by Mergify.
Cherry-pick of 5f65a65 has failed:

On branch mergify/bp/2.12.x/pr-4297
Your branch is up to date with 'origin/2.12.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
	modified:   test/unittest/transport/TCPv6Tests.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/unittest/transport/TCPv4Tests.cpp
	both modified:   test/unittest/transport/mock/MockTCPv4Transport.h
	both modified:   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 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

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Feb 21, 2024
@EduPonz EduPonz added this to the v2.12.2 milestone Feb 21, 2024
@cferreiragonz cferreiragonz changed the base branch from 2.12.x to mergify/bp/2.12.x/pr-4237 March 1, 2024 11:05
@cferreiragonz cferreiragonz added the temporarily-blocked PR must be merged after another one label Mar 1, 2024
@cferreiragonz cferreiragonz added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Mar 1, 2024
@cferreiragonz
Copy link
Contributor

@jepemi jepemi force-pushed the mergify/bp/2.12.x/pr-4237 branch from 5a72946 to 61b4144 Compare March 1, 2024 13:06
Base automatically changed from mergify/bp/2.12.x/pr-4237 to 2.12.x March 6, 2024 09:42
@cferreiragonz cferreiragonz removed the temporarily-blocked PR must be merged after another one label Mar 12, 2024
* Refs #20238: Add whitelist test in TCPv4

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

* Refs #20238: Add whitelist test in TCPv6

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

* Refs #20238: Adding interface to locator if whitelist is not empty

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

* Refs #20238: Uncrustify

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

* Refs #20238: Fix build in Windows

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

* Refs #20238: Apply suggestions

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

* Refs #20238: Remove repeated addition of listener port (added by default)

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

---------

Signed-off-by: cferreiragonz <[email protected]>
(cherry picked from commit 5f65a65)

Fix Ipv6 names

Signed-off-by: cferreiragonz <[email protected]>
@elianalf
Copy link
Contributor

@richiprosima please test this

@elianalf elianalf added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels Mar 13, 2024
@EduPonz EduPonz merged commit 4efd85c into 2.12.x Mar 13, 2024
10 of 16 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.12.x/pr-4297 branch March 13, 2024 14:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants