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) #4414

Merged
merged 2 commits into from
Apr 10, 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.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 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.6.8 milestone Feb 21, 2024
@Mario-DL
Copy link
Member

@cferreiragonz friendly pinging here also.
Remember to rebase also

@cferreiragonz cferreiragonz changed the base branch from 2.6.x to mergify/bp/2.6.x/pr-4277 February 26, 2024 07:07
@cferreiragonz cferreiragonz force-pushed the mergify/bp/2.6.x/pr-4297 branch from 998c384 to d59e234 Compare February 28, 2024 11:36
@cferreiragonz
Copy link
Contributor

cferreiragonz commented Feb 28, 2024

@cferreiragonz cferreiragonz force-pushed the mergify/bp/2.6.x/pr-4297 branch from d59e234 to 9ece5b6 Compare February 28, 2024 12:02
@cferreiragonz cferreiragonz force-pushed the mergify/bp/2.6.x/pr-4277 branch from 88fe9f3 to c3e6242 Compare March 26, 2024 07:24
@cferreiragonz cferreiragonz added temporarily-blocked PR must be merged after another one and removed conflicts Backport PR wich git cherry pick failed labels Mar 26, 2024
@cferreiragonz cferreiragonz force-pushed the mergify/bp/2.6.x/pr-4277 branch from c3e6242 to b4acd76 Compare March 27, 2024 07:16
Base automatically changed from mergify/bp/2.6.x/pr-4277 to 2.6.x April 1, 2024 10:58
@Mario-DL Mario-DL removed the temporarily-blocked PR must be merged after another one label Apr 1, 2024
@Mario-DL
Copy link
Member

Mario-DL commented Apr 1, 2024

@cferreiragonz would you mind addressing the conflicts here ? Next one in the loop !

* 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)
Signed-off-by: cferreiragonz <[email protected]>
@cferreiragonz cferreiragonz force-pushed the mergify/bp/2.6.x/pr-4297 branch from 9ece5b6 to c98e924 Compare April 1, 2024 12:28
@cferreiragonz cferreiragonz added the ci-pending PR which CI is running label Apr 1, 2024
@Mario-DL
Copy link
Member

Mario-DL commented Apr 2, 2024

@richiprosima please test this

@Mario-DL
Copy link
Member

Mario-DL commented Apr 3, 2024

@richiprosima please test mac

6 similar comments
@Mario-DL
Copy link
Member

Mario-DL commented Apr 4, 2024

@richiprosima please test mac

@Mario-DL
Copy link
Member

Mario-DL commented Apr 5, 2024

@richiprosima please test mac

@Mario-DL
Copy link
Member

Mario-DL commented Apr 8, 2024

@richiprosima please test mac

@Mario-DL
Copy link
Member

Mario-DL commented Apr 8, 2024

@richiprosima please test mac

@Mario-DL
Copy link
Member

Mario-DL commented Apr 9, 2024

@richiprosima please test mac

@Mario-DL
Copy link
Member

@richiprosima please test mac

@Mario-DL
Copy link
Member

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

@Mario-DL Mario-DL removed the ci-pending PR which CI is running label Apr 10, 2024
@Mario-DL Mario-DL added the ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. label Apr 10, 2024
@EduPonz EduPonz merged commit cd4f758 into 2.6.x Apr 10, 2024
9 of 15 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.6.x/pr-4297 branch April 10, 2024 06:32
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