Skip to content

[22055] Fix unique network flows with TCP transports (backport #5461)#5489

Merged
MiguelCompany merged 2 commits into2.10.xfrom
mergify/bp/2.10.x/pr-5461
Jan 29, 2025
Merged

[22055] Fix unique network flows with TCP transports (backport #5461)#5489
MiguelCompany merged 2 commits into2.10.xfrom
mergify/bp/2.10.x/pr-5461

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Dec 11, 2024

Description

This PR fixes the behavior of Unique Network Flows with TCP transports. When activated, the logical port should be changed instead of modifying the physical port. This allows the communication of participants with TCP transports and the fastdds.unique_network_flows property activated, ensuring that the listening port specified is not modified.

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

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

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

* Refs #22055: Add regression tests

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

* Refs #22055: Fix unique flows for TCP

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

* Refs #22055: Fix tests

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

---------

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
(cherry picked from commit 81cdb10)

# Conflicts:
#	test/blackbox/common/BlackboxTestsTransportTCP.cpp
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Dec 11, 2024
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Dec 11, 2024

Cherry-pick of 81cdb10 has failed:

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

You are currently cherry-picking commit 81cdb10a9.
  (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/participant/RTPSParticipantImpl.cpp
	modified:   test/blackbox/api/dds-pim/PubSubParticipant.hpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/blackbox/common/BlackboxTestsTransportTCP.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

@MiguelCompany MiguelCompany added this to the v2.10.7 milestone Dec 11, 2024
@cferreiragonz cferreiragonz added the temporarily-blocked PR must be merged after another one label Jan 8, 2025
@cferreiragonz cferreiragonz removed the temporarily-blocked PR must be merged after another one label Jan 22, 2025
Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
@cferreiragonz cferreiragonz added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Jan 22, 2025
@MiguelCompany MiguelCompany merged commit c7162c3 into 2.10.x Jan 29, 2025
@MiguelCompany MiguelCompany deleted the mergify/bp/2.10.x/pr-5461 branch January 29, 2025 11:58
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants