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

[22056] Fix TCP discovery server locators translation (backport #5382) (backport #5410) #5437

Merged
merged 1 commit into from
Dec 20, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 28, 2024

Description

This PR is a partial backport of #5382, which fixes a bug where a TCP client connecting to localhost is unable to identify the locator of a TCP discovery server with a custom GUID listening on any. This causes the client to create two different channels for the same connection, where the latest can never be reached. The reason is that the server's locator is not considered from the same host due to its custom GUID. Hence, the server transforms the client's locator into localhost but the client does not do the same with the server's locator.

The proposed fix is to create a new entry into the channel_resources_ map for each local interface available. In this way, every locator with local address will reuse the same TCP channel, instead of creating a new one. Any new attempt of creating a new channel will be rejected by the server if the address was previously added.

@Mergifyio backport 3.0.x 2.14.x 2.10.x

Contributor Checklist

  • Commit messages follow the project guidelines.

  • The code follows the style guidelines of this project.

  • Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally. Related tests: [22056] Transform locators using new host_id PID (backport #107) Discovery-Server#108

  • N/A Any new/modified methods have been properly documented using Doxygen.

  • N/A Any new configuration API has an equivalent XML API (with the corresponding XSD extension)

  • Changes are backport compatible: they do NOT break ABI nor change library core behavior.

  • Changes are API compatible.

  • N/A New feature has been added to the versions.md file (if applicable).

  • N/A New feature has been documented/Current behavior is correctly described in the documentation.

  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • If this is a critical bug fix, backports to the critical-only supported branches have been requested.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

This is an automatic backport of pull request #5410 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Nov 28, 2024
Copy link
Contributor Author

mergify bot commented Nov 28, 2024

Cherry-pick of d71913b has failed:

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

You are currently cherry-picking commit d71913b7a.
  (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/security/SecurityManager.cpp
	modified:   src/cpp/rtps/transport/TCPTransportInterface.cpp
	modified:   src/cpp/rtps/transport/TCPTransportInterface.h
	modified:   src/cpp/rtps/transport/tcp/RTCPMessageManager.cpp
	modified:   test/unittest/transport/TCPv4Tests.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   tools/fds/server.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

@cferreiragonz cferreiragonz added this to the v2.14.5 milestone Nov 28, 2024
@cferreiragonz cferreiragonz force-pushed the mergify/bp/2.14.x/pr-5410 branch from 4e11edd to 135d8a9 Compare November 28, 2024 14:21
@cferreiragonz cferreiragonz added needs-review PR that is ready to be reviewed ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Nov 28, 2024
@cferreiragonz cferreiragonz requested review from cferreiragonz and removed request for cferreiragonz November 28, 2024 14:21
---------

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

# Conflicts:
#	tools/fds/server.cpp
@cferreiragonz cferreiragonz force-pushed the mergify/bp/2.14.x/pr-5410 branch from 135d8a9 to 7082cbb Compare November 28, 2024 14:34
@cferreiragonz cferreiragonz requested review from cferreiragonz and removed request for cferreiragonz November 28, 2024 14:35
@cferreiragonz cferreiragonz added high-priority and removed ci-pending PR which CI is running labels Dec 18, 2024
@github-actions github-actions bot added the ci-pending PR which CI is running label Dec 18, 2024
Copy link
Contributor

@EugenioCollado EugenioCollado left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with green CI

@cferreiragonz cferreiragonz added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed needs-review PR that is ready to be reviewed high-priority ci-pending PR which CI is running labels Dec 20, 2024
@cferreiragonz cferreiragonz merged commit 7e6ff9d into 2.14.x Dec 20, 2024
32 of 33 checks passed
@cferreiragonz cferreiragonz deleted the mergify/bp/2.14.x/pr-5410 branch December 20, 2024 07:47
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.

2 participants