Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 3 commits into from
Dec 11, 2024
Merged

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

merged 3 commits into from
Dec 11, 2024

Conversation

cferreiragonz
Copy link
Contributor

@cferreiragonz cferreiragonz commented Dec 5, 2024 •
edited by MiguelCompany
Loading

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.

@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
@cferreiragonz
Refs #22055: Fix tests
9d5f9ba 
Signed-off-by: cferreiragonz <[email protected]>
@cferreiragonz cferreiragonz force-pushed the bugfix/tcp_unique_network_flows branch from d981ae8 to 9d5f9ba Compare December 10, 2024 09:18
MiguelCompany
MiguelCompany approved these changes Dec 10, 2024
View reviewed changes
Copy link
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
17 checks passed
@MiguelCompany MiguelCompany deleted the bugfix/tcp_unique_network_flows branch December 11, 2024 15:51
@MiguelCompany
Copy link
Member

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

@mergify Mergify
Copy link
Contributor

mergify bot commented Dec 11, 2024 •
edited
Loading

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

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Dec 11, 2024
@cferreiragonz @mergify
Fix unique network flows with TCP transports (#5461)
cfaa6b0 
* Refs #22055: Add regression tests

Signed-off-by: cferreiragonz <[email protected]>

* Refs #22055: Fix unique flows for TCP

Signed-off-by: cferreiragonz <[email protected]>

* Refs #22055: Fix tests

Signed-off-by: cferreiragonz <[email protected]>

---------

Signed-off-by: cferreiragonz <[email protected]>
(cherry picked from commit 81cdb10)
@mergify mergify bot mentioned this pull request Dec 11, 2024
Merged
13 tasks
mergify bot pushed a commit that referenced this pull request Dec 11, 2024
@cferreiragonz @mergify
Fix unique network flows with TCP transports (#5461)
f4a3f91 
* Refs #22055: Add regression tests

Signed-off-by: cferreiragonz <[email protected]>

* Refs #22055: Fix unique flows for TCP

Signed-off-by: cferreiragonz <[email protected]>

* Refs #22055: Fix tests

Signed-off-by: cferreiragonz <[email protected]>

---------

Signed-off-by: cferreiragonz <[email protected]>
(cherry picked from commit 81cdb10)
mergify bot pushed a commit that referenced this pull request Dec 11, 2024
@cferreiragonz @mergify
Fix unique network flows with TCP transports (#5461)
a4cd149 
* Refs #22055: Add regression tests

Signed-off-by: cferreiragonz <[email protected]>

* Refs #22055: Fix unique flows for TCP

Signed-off-by: cferreiragonz <[email protected]>

* Refs #22055: Fix tests

Signed-off-by: cferreiragonz <[email protected]>

---------

Signed-off-by: cferreiragonz <[email protected]>
(cherry picked from commit 81cdb10)
This was referenced Dec 11, 2024
Merged
Merged
mergify bot pushed a commit that referenced this pull request Dec 11, 2024
@cferreiragonz @mergify
Fix unique network flows with TCP transports (#5461)
604a27d 
* Refs #22055: Add regression tests

Signed-off-by: cferreiragonz <[email protected]>

* Refs #22055: Fix unique flows for TCP

Signed-off-by: cferreiragonz <[email protected]>

* Refs #22055: Fix tests

Signed-off-by: cferreiragonz <[email protected]>

---------

Signed-off-by: cferreiragonz <[email protected]>
(cherry picked from commit 81cdb10)

# Conflicts:
#	test/blackbox/common/BlackboxTestsTransportTCP.cpp
@mergify mergify bot mentioned this pull request Dec 11, 2024
Merged
13 tasks
MiguelCompany pushed a commit that referenced this pull request Dec 12, 2024
@mergify @cferreiragonz
Fix unique network flows with TCP transports (#5461) (#5486)
efed5be 
* Refs #22055: Add regression tests

Signed-off-by: cferreiragonz <[email protected]>

* Refs #22055: Fix unique flows for TCP

Signed-off-by: cferreiragonz <[email protected]>

* Refs #22055: Fix tests

Signed-off-by: cferreiragonz <[email protected]>

---------

Signed-off-by: cferreiragonz <[email protected]>
(cherry picked from commit 81cdb10)

Co-authored-by: Carlos Ferreira González <[email protected]>
MiguelCompany pushed a commit that referenced this pull request Dec 17, 2024
@mergify @cferreiragonz
Fix unique network flows with TCP transports (#5461) (#5488)
411fc60 
* Fix unique network flows with TCP transports (#5461)

* Refs #22055: Add regression tests

Signed-off-by: cferreiragonz <[email protected]>

* Refs #22055: Fix unique flows for TCP

Signed-off-by: cferreiragonz <[email protected]>

* Refs #22055: Fix tests

Signed-off-by: cferreiragonz <[email protected]>

---------

Signed-off-by: cferreiragonz <[email protected]>
(cherry picked from commit 81cdb10)

* Solve 2.14 conflicts

Signed-off-by: cferreiragonz <[email protected]>

---------

Signed-off-by: cferreiragonz <[email protected]>
Co-authored-by: Carlos Ferreira González <[email protected]>
@cferreiragonz cferreiragonz mentioned this pull request Dec 17, 2024
Closed
MiguelCompany pushed a commit that referenced this pull request Dec 18, 2024
@mergify @cferreiragonz
Fix unique network flows with TCP transports (#5461) (#5487)
30d66b1 
* Refs #22055: Add regression tests

Signed-off-by: cferreiragonz <[email protected]>

* Refs #22055: Fix unique flows for TCP

Signed-off-by: cferreiragonz <[email protected]>

* Refs #22055: Fix tests

Signed-off-by: cferreiragonz <[email protected]>

---------

Signed-off-by: cferreiragonz <[email protected]>
(cherry picked from commit 81cdb10)

Co-authored-by: Carlos Ferreira González <[email protected]>
@juanlofer-eprosima juanlofer-eprosima mentioned this pull request Jan 20, 2025
Merged
11 tasks
This was referenced Jan 22, 2025
Merged
Merged
Merged
Merged
MiguelCompany pushed a commit that referenced this pull request Jan 29, 2025
@mergify @cferreiragonz
Fix unique network flows with TCP transports (#5461) (#5489)
c7162c3 
* Fix unique network flows with TCP transports (#5461)

* Refs #22055: Add regression tests

Signed-off-by: cferreiragonz <[email protected]>

* Refs #22055: Fix unique flows for TCP

Signed-off-by: cferreiragonz <[email protected]>

* Refs #22055: Fix tests

Signed-off-by: cferreiragonz <[email protected]>

---------

Signed-off-by: cferreiragonz <[email protected]>
(cherry picked from commit 81cdb10)

# Conflicts:
#	test/blackbox/common/BlackboxTestsTransportTCP.cpp

* Solve conflicts

Signed-off-by: cferreiragonz <[email protected]>

---------

Signed-off-by: cferreiragonz <[email protected]>
Co-authored-by: Carlos Ferreira González <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MiguelCompany MiguelCompany MiguelCompany approved these changes

Assignees
No one assigned
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Milestone
v3.2.0
Development

Successfully merging this pull request may close these issues.
2 participants
@cferreiragonz @MiguelCompany