Skip to content

[22469] Avoid calling setIPv4 in TCPTransportInterface (backport #5492)#5893

Merged
MiguelCompany merged 1 commit into2.14.xfrom
mergify/bp/2.14.x/pr-5492
Jul 3, 2025
Merged

[22469] Avoid calling setIPv4 in TCPTransportInterface (backport #5492)#5893
MiguelCompany merged 1 commit into2.14.xfrom
mergify/bp/2.14.x/pr-5492

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jun 19, 2025

Description

This PR adds a new method copyAddress which allows to copy the whole address of one locator to another. It uses this method to replace the setIPv4 method of TCPTransportInterace introduced in #5382 which caused undesired warnings.

It also excludes TCPv6 cases from this logic, leaving TCPv6 comms as before #5382.

@Mergifyio backport 3.1.x 2.14.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

  • 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)

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

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

@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Jun 19, 2025

Cherry-pick of f2a55e9 has failed:

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

You are currently cherry-picking commit f2a55e9a.
  (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/utils/IPLocator.cpp
	modified:   test/unittest/transport/TCPv4Tests.cpp
	modified:   test/unittest/transport/TCPv6Tests.cpp
	modified:   test/unittest/utils/LocatorTests.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   include/fastrtps/utils/IPLocator.h
	both modified:   src/cpp/rtps/transport/TCPTransportInterface.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

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Jun 19, 2025
@MiguelCompany MiguelCompany added this to the v2.14.5 milestone Jun 19, 2025
* Refs #22469: Regression Tests for IPv6

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

* Refs #22469: New method copyAddress

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

* Refs #22469: Fix TCPTransportInterface

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

* Refs #22469: Apply Review

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

* Refs #22469: Disable grouping of locators in single channel for TCPv6

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

* Refs #22469: Uncrustify

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

* Refs #22469: Apply review

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

* Refs #22469: Allow to copyIPv4 between two locators

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

* Refs #22469: Apply Review 2

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

---------

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>
@EugenioCollado EugenioCollado force-pushed the mergify/bp/2.14.x/pr-5492 branch from 0eb0c8b to 22743c7 Compare July 2, 2025 10:49
@EugenioCollado EugenioCollado added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Jul 2, 2025
@EugenioCollado EugenioCollado self-requested a review July 2, 2025 10:50
Copy link
Copy Markdown
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

@EugenioCollado EugenioCollado 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 Jul 3, 2025
@EugenioCollado
Copy link
Copy Markdown
Contributor

The test failing is unrelated to this PR and will be fixed in its own PR. RTM with @MiguelCompany superpowers

@MiguelCompany MiguelCompany merged commit 300d4ff into 2.14.x Jul 3, 2025
17 of 19 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.14.x/pr-5492 branch July 3, 2025 08:48
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