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

Merged
merged 1 commit into from
Nov 28, 2024

Conversation

cferreiragonz
Copy link
Contributor

@cferreiragonz cferreiragonz commented Nov 18, 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.

---------

Signed-off-by: cferreiragonz <[email protected]>
@cferreiragonz cferreiragonz added needs-review PR that is ready to be reviewed ci-pending PR which CI is running labels Nov 18, 2024
@cferreiragonz cferreiragonz added this to the v3.1.1 milestone Nov 18, 2024
@cferreiragonz cferreiragonz changed the title Fix TCP discovery server locators translation (backport #5382) [22056] Fix TCP discovery server locators translation (backport #5382) Nov 18, 2024
@MiguelCompany MiguelCompany self-requested a review November 18, 2024 15:46
@MiguelCompany MiguelCompany merged commit d71913b into 3.1.x Nov 28, 2024
16 of 17 checks passed
@MiguelCompany MiguelCompany deleted the bp/3.1.x/pr-5382 branch November 28, 2024 08:32
@MiguelCompany
Copy link
Member

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

Copy link
Contributor

mergify bot commented Nov 28, 2024

backport 3.0.x 2.14.x 2.10.x

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Nov 28, 2024
---------

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

# Conflicts:
#	src/cpp/rtps/transport/TCPTransportInterface.cpp
#	test/unittest/transport/TCPv4Tests.cpp
#	tools/fds/server.cpp
mergify bot pushed a commit that referenced this pull request Nov 28, 2024
---------

Signed-off-by: cferreiragonz <[email protected]>
(cherry picked from commit d71913b)
mergify bot pushed a commit that referenced this pull request Nov 28, 2024
---------

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

# Conflicts:
#	tools/fds/server.cpp
cferreiragonz added a commit that referenced this pull request Nov 28, 2024
---------

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

# Conflicts:
#	tools/fds/server.cpp
cferreiragonz added a commit that referenced this pull request Nov 28, 2024
---------

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

# Conflicts:
#	tools/fds/server.cpp
MiguelCompany pushed a commit that referenced this pull request Dec 3, 2024
---------

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

Co-authored-by: Carlos Ferreira González <[email protected]>
cferreiragonz added a commit that referenced this pull request Dec 20, 2024
---------

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

Co-authored-by: Carlos Ferreira González <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci-pending PR which CI is running needs-review PR that is ready to be reviewed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants