[22056] Fix TCP discovery server locators translation (backport #5382) (backport #5410)#5438
Merged
MiguelCompany merged 2 commits into2.10.xfrom May 27, 2025
Merged
Conversation
Contributor
Author
|
Cherry-pick of d71913b has failed: 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 |
12 tasks
c47619a to
cc201d1
Compare
Member
|
@cferreiragonz This fails to build. Could you take a look? |
cc201d1 to
6b9e630
Compare
Member
|
@Mergifyio rebase |
--------- Signed-off-by: cferreiragonz <carlosferreira@eprosima.com> (cherry picked from commit d71913b) # Conflicts: # src/cpp/rtps/transport/TCPTransportInterface.cpp # test/unittest/transport/TCPv4Tests.cpp # tools/fds/server.cpp
Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
Contributor
Author
✅ Branch has been successfully rebased |
6b9e630 to
32c5e0f
Compare
786815b to
32c5e0f
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
This PR is a partial backport of #5382, which fixes a bug where a TCP client connecting to
localhostis unable to identify the locator of a TCP discovery server with a custom GUID listening onany. 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 intolocalhostbut 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.mdfile (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
This is an automatic backport of pull request #5410 done by [Mergify](https://mergify.com).