Skip to content

[21170] Fix DS servers not connecting due to ports logic (backport #4941)#4952

Merged
EduPonz merged 1 commit into2.6.xfrom
mergify/bp/2.6.x/pr-4941
Jun 28, 2024
Merged

[21170] Fix DS servers not connecting due to ports logic (backport #4941)#4952
EduPonz merged 1 commit into2.6.xfrom
mergify/bp/2.6.x/pr-4941

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jun 14, 2024

Description

This PR fixes a bug that was avoiding discovery when a DS server tries to connect to another server which has a smaller physical port. The logic implemented in #4586 needs to be used to fix the issue.
It also adds support to automatically set the logical port of remote servers when the participant discoveryProtocol is configured as DiscoveryProtocol::SERVER, which was missing.

@Mergifyio backport 2.14.x 2.13.x 2.10.x 2.6.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

  • 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.
  • 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 #4941 done by [Mergify](https://mergify.com).

* Refs #21170: Add DS servers connection test

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #21170: Support DS servers connection

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #21170: Revision

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #21170: Uncrustify

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Refs #21170: Fix Windows build & comment

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

---------

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
(cherry picked from commit b441560)
@MiguelCompany MiguelCompany added this to the v2.6.9 milestone Jun 14, 2024
@cferreiragonz cferreiragonz self-requested a review June 27, 2024 08:11
@github-actions github-actions bot added the ci-pending PR which CI is running label Jun 27, 2024
@Mario-DL
Copy link
Copy Markdown
Contributor

@richiprosima please test discovery-server

@Mario-DL Mario-DL 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 Jun 27, 2024
@Mario-DL
Copy link
Copy Markdown
Contributor

Failed tests unrelated to the PR

@EduPonz EduPonz merged commit 88b583c into 2.6.x Jun 28, 2024
@EduPonz EduPonz deleted the mergify/bp/2.6.x/pr-4941 branch June 28, 2024 10:31
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.

4 participants