Skip to content

[22055] Fix unique network flows with TCP transports#5461

Merged
MiguelCompany merged 3 commits intomasterfrom
bugfix/tcp_unique_network_flows
Dec 11, 2024
Merged

[22055] Fix unique network flows with TCP transports#5461
MiguelCompany merged 3 commits intomasterfrom
bugfix/tcp_unique_network_flows

Conversation

@cferreiragonz
Copy link
Copy Markdown
Contributor

@cferreiragonz cferreiragonz commented Dec 5, 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.

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
@cferreiragonz cferreiragonz added needs-review PR that is ready to be reviewed ci-pending PR which CI is running labels Dec 5, 2024
@cferreiragonz cferreiragonz added this to the v3.2.0 milestone Dec 5, 2024
@cferreiragonz cferreiragonz requested review from MiguelCompany and richiprosima and removed request for richiprosima December 5, 2024 07:09
Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
@cferreiragonz cferreiragonz force-pushed the bugfix/tcp_unique_network_flows branch from d981ae8 to 9d5f9ba Compare December 10, 2024 09:18
Copy link
Copy Markdown
Member

@MiguelCompany MiguelCompany left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with green CI

@MiguelCompany MiguelCompany added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed needs-review PR that is ready to be reviewed ci-pending PR which CI is running labels Dec 11, 2024
@MiguelCompany MiguelCompany merged commit 81cdb10 into master Dec 11, 2024
@MiguelCompany MiguelCompany deleted the bugfix/tcp_unique_network_flows branch December 11, 2024 15:51
@MiguelCompany
Copy link
Copy Markdown
Member

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

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Dec 11, 2024

backport 3.1.x 3.0.x 2.14.x 2.10.x

✅ Backports have been created

Details

mergify bot pushed a commit that referenced this pull request Dec 11, 2024
* 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)
mergify bot pushed a commit that referenced this pull request Dec 11, 2024
* 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)
mergify bot pushed a commit that referenced this pull request Dec 11, 2024
* 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)
mergify bot pushed a commit that referenced this pull request Dec 11, 2024
* 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
MiguelCompany pushed a commit that referenced this pull request Dec 12, 2024
* 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)

Co-authored-by: Carlos Ferreira González <carlosferreira@eprosima.com>
MiguelCompany pushed a commit that referenced this pull request Dec 17, 2024
* Fix unique network flows with TCP transports (#5461)

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

* Solve 2.14 conflicts

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

---------

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
Co-authored-by: Carlos Ferreira González <carlosferreira@eprosima.com>
MiguelCompany pushed a commit that referenced this pull request Dec 18, 2024
* 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)

Co-authored-by: Carlos Ferreira González <carlosferreira@eprosima.com>
MiguelCompany pushed a commit that referenced this pull request Jan 29, 2025
* Fix unique network flows with TCP transports (#5461)

* 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

* Solve conflicts

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

---------

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
Co-authored-by: Carlos Ferreira González <carlosferreira@eprosima.com>
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.

2 participants