[20179] TCP unique client announced local port #4216

jepemi · 2024-01-09T08:16:57Z

Description

TCP clients used to communicate its PID as its locator port. When multiple clients are running within the same process this led to the overwriting of elements in the server's channel resources map. This PR guarantees that each client has a unique local port.

@Mergifyio backport 2.12.x 2.11.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.
Changes are ABI compatible.
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.
Check contributor checklist is correct.
Check CI results: changes do not issue any warning.
Check CI results: failing tests are unrelated with the changes.

jepemi · 2024-01-09T08:22:25Z

@Mergifyio backport 2.12.x 2.11.x 2.10.x 2.6.x

mergify · 2024-01-09T08:22:38Z

backport 2.12.x 2.11.x 2.10.x 2.6.x

✅ Backports have been created

#4284 [20179] TCP unique client announced local port (backport #4216) has been created for branch 2.12.x but encountered conflicts
#4285 [20179] TCP unique client announced local port (backport #4216) has been created for branch 2.11.x but encountered conflicts
#4286 [20179] TCP unique client announced local port (backport #4216) has been created for branch 2.10.x but encountered conflicts
#4287 [20179] TCP unique client announced local port (backport #4216) has been created for branch 2.6.x but encountered conflicts

jepemi · 2024-01-15T14:28:40Z

@richiprosima please test this

src/cpp/rtps/transport/TCPTransportInterface.cpp

src/cpp/rtps/transport/tcp/RTCPMessageManager.cpp

test/unittest/transport/mock/MockTCPv4Transport.h

test/unittest/transport/mock/MockTCPv6Transport.h

src/cpp/rtps/transport/TCPTransportInterface.h

src/cpp/rtps/transport/TCPTransportInterface.cpp

MiguelCompany · 2024-01-16T14:07:22Z

@richiprosima Please test this

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

jepemi · 2024-01-18T09:55:59Z

@richiprosima Please test this

MiguelCompany · 2024-01-22T14:37:55Z

@richiprosima Please test mac

JesusPoderoso · 2024-01-23T07:48:05Z

@richiprosima please test mac 🥲

* Refs #20179: Guarantee unique announced client local port Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Regression tests Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Prevent from join() deadlock (ReceiverResource mtx taken) Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Uncrustify Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Fix windows release tests Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Apply sugestions Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Uncrustify Signed-off-by: Jesus Perez <jesusperez@eprosima.com> --------- Signed-off-by: Jesus Perez <jesusperez@eprosima.com> (cherry picked from commit b43f3a0) # Conflicts: # src/cpp/rtps/transport/TCPTransportInterface.cpp

* Refs #20179: Guarantee unique announced client local port Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Regression tests Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Prevent from join() deadlock (ReceiverResource mtx taken) Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Uncrustify Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Fix windows release tests Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Apply sugestions Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Uncrustify Signed-off-by: Jesus Perez <jesusperez@eprosima.com> --------- Signed-off-by: Jesus Perez <jesusperez@eprosima.com> (cherry picked from commit b43f3a0) # Conflicts: # src/cpp/rtps/transport/TCPTransportInterface.cpp # src/cpp/rtps/transport/TCPTransportInterface.h

* Refs #20179: Guarantee unique announced client local port Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Regression tests Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Prevent from join() deadlock (ReceiverResource mtx taken) Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Uncrustify Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Fix windows release tests Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Apply sugestions Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Uncrustify Signed-off-by: Jesus Perez <jesusperez@eprosima.com> --------- Signed-off-by: Jesus Perez <jesusperez@eprosima.com> (cherry picked from commit b43f3a0) # Conflicts: # src/cpp/rtps/transport/TCPTransportInterface.cpp # src/cpp/rtps/transport/TCPTransportInterface.h # test/unittest/transport/TCPv6Tests.cpp

* TCP unique client announced local port (#4216) * Refs #20179: Guarantee unique announced client local port Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Regression tests Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Prevent from join() deadlock (ReceiverResource mtx taken) Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Uncrustify Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Fix windows release tests Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Apply sugestions Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Uncrustify Signed-off-by: Jesus Perez <jesusperez@eprosima.com> --------- Signed-off-by: Jesus Perez <jesusperez@eprosima.com> (cherry picked from commit b43f3a0) # Conflicts: # src/cpp/rtps/transport/TCPTransportInterface.cpp # src/cpp/rtps/transport/TCPTransportInterface.h * Refs #20179: Solve conflicts Signed-off-by: Jesus Perez <jesusperez@eprosima.com> --------- Signed-off-by: Jesus Perez <jesusperez@eprosima.com> Co-authored-by: Jesús Pérez <78275223+jepemi@users.noreply.github.com> Co-authored-by: Jesus Perez <jesusperez@eprosima.com>

* TCP unique client announced local port (#4216) * Refs #20179: Guarantee unique announced client local port Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Regression tests Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Prevent from join() deadlock (ReceiverResource mtx taken) Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Uncrustify Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Fix windows release tests Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Apply sugestions Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Uncrustify Signed-off-by: Jesus Perez <jesusperez@eprosima.com> --------- Signed-off-by: Jesus Perez <jesusperez@eprosima.com> (cherry picked from commit b43f3a0) # Conflicts: # src/cpp/rtps/transport/TCPTransportInterface.cpp * Refs #20179: Solve conflicts Signed-off-by: Jesus Perez <jesusperez@eprosima.com> --------- Signed-off-by: Jesus Perez <jesusperez@eprosima.com> Co-authored-by: Jesús Pérez <78275223+jepemi@users.noreply.github.com> Co-authored-by: Jesus Perez <jesusperez@eprosima.com>

* TCP unique client announced local port (#4216) * Refs #20179: Guarantee unique announced client local port Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Regression tests Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Prevent from join() deadlock (ReceiverResource mtx taken) Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Uncrustify Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Fix windows release tests Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Apply sugestions Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Uncrustify Signed-off-by: Jesus Perez <jesusperez@eprosima.com> --------- Signed-off-by: Jesus Perez <jesusperez@eprosima.com> (cherry picked from commit b43f3a0) # Conflicts: # src/cpp/rtps/transport/TCPTransportInterface.cpp # src/cpp/rtps/transport/TCPTransportInterface.h * Refs #20179: Solve conflicts Signed-off-by: Jesus Perez <jesusperez@eprosima.com> --------- Signed-off-by: Jesus Perez <jesusperez@eprosima.com> Co-authored-by: Jesús Pérez <78275223+jepemi@users.noreply.github.com> Co-authored-by: Jesus Perez <jesusperez@eprosima.com>

* Refs #20179: Guarantee unique announced client local port Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Regression tests Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Prevent from join() deadlock (ReceiverResource mtx taken) Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Uncrustify Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Fix windows release tests Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Apply sugestions Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Uncrustify Signed-off-by: Jesus Perez <jesusperez@eprosima.com> --------- Signed-off-by: Jesus Perez <jesusperez@eprosima.com> (cherry picked from commit b43f3a0) # Conflicts: # src/cpp/rtps/transport/TCPTransportInterface.cpp # src/cpp/rtps/transport/TCPTransportInterface.h # test/unittest/transport/TCPv6Tests.cpp

* TCP unique client announced local port (#4216) * Refs #20179: Guarantee unique announced client local port Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Regression tests Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Prevent from join() deadlock (ReceiverResource mtx taken) Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Uncrustify Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Fix windows release tests Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Apply sugestions Signed-off-by: Jesus Perez <jesusperez@eprosima.com> * Refs #20179: Uncrustify Signed-off-by: Jesus Perez <jesusperez@eprosima.com> --------- Signed-off-by: Jesus Perez <jesusperez@eprosima.com> (cherry picked from commit b43f3a0) # Conflicts: # src/cpp/rtps/transport/TCPTransportInterface.cpp # src/cpp/rtps/transport/TCPTransportInterface.h # test/unittest/transport/TCPv6Tests.cpp * Refs #20179: Solve conflicts Signed-off-by: Jesus Perez <jesusperez@eprosima.com> --------- Signed-off-by: Jesus Perez <jesusperez@eprosima.com> Co-authored-by: Jesús Pérez <78275223+jepemi@users.noreply.github.com> Co-authored-by: Jesus Perez <jesusperez@eprosima.com>

jepemi marked this pull request as ready for review January 9, 2024 08:23

EduPonz added this to the v2.13.2 milestone Jan 10, 2024

jepemi force-pushed the bugfix/tcp_client_announced_local_port branch from c237048 to a8971e4 Compare January 12, 2024 08:53

jepemi changed the title ~~[2017] TCP unique client announced local port~~ [20179] TCP unique client announced local port Jan 15, 2024

MiguelCompany requested changes Jan 16, 2024

View reviewed changes

jepemi force-pushed the bugfix/tcp_client_announced_local_port branch from a8971e4 to 8151eb5 Compare January 16, 2024 13:38

jepemi mentioned this pull request Jan 16, 2024

[20119] TCP socket send buffer limit #4237

Merged

14 tasks

MiguelCompany approved these changes Jan 16, 2024

View reviewed changes

MiguelCompany added the ci-pending PR which CI is running label Jan 16, 2024

jepemi added 7 commits January 18, 2024 10:55

Refs #20179: Guarantee unique announced client local port

fbe79d4

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

Refs #20179: Regression tests

ab94532

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

Refs #20179: Prevent from join() deadlock (ReceiverResource mtx taken)

31fb616

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

Refs #20179: Uncrustify

8956a94

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

Refs #20179: Fix windows release tests

87e78f9

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

Refs #20179: Apply sugestions

3ab631c

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

Refs #20179: Uncrustify

a283e19

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>

jepemi force-pushed the bugfix/tcp_client_announced_local_port branch from a505edf to a283e19 Compare January 18, 2024 09:55

JesusPoderoso 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 Jan 24, 2024

MiguelCompany merged commit b43f3a0 into master Jan 24, 2024
12 of 14 checks passed

MiguelCompany deleted the bugfix/tcp_client_announced_local_port branch January 24, 2024 08:48

This was referenced Jan 24, 2024

[20179] TCP unique client announced local port (backport #4216) #4284

Merged

[20179] TCP unique client announced local port (backport #4216) #4285

Merged

[20179] TCP unique client announced local port (backport #4216) #4286

Merged

mergify bot mentioned this pull request Jan 24, 2024

[20179] TCP unique client announced local port (backport #4216) #4287

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[20179] TCP unique client announced local port #4216

[20179] TCP unique client announced local port #4216

jepemi commented Jan 9, 2024 •

edited by JesusPoderoso

Loading

jepemi commented Jan 9, 2024

mergify bot commented Jan 9, 2024 •

edited

Loading

jepemi commented Jan 15, 2024

MiguelCompany commented Jan 16, 2024

jepemi commented Jan 18, 2024

MiguelCompany commented Jan 22, 2024

JesusPoderoso commented Jan 23, 2024

[20179] TCP unique client announced local port #4216

[20179] TCP unique client announced local port #4216

Conversation

jepemi commented Jan 9, 2024 • edited by JesusPoderoso Loading

Description

Contributor Checklist

Reviewer Checklist

jepemi commented Jan 9, 2024

mergify bot commented Jan 9, 2024 • edited Loading

✅ Backports have been created

jepemi commented Jan 15, 2024

MiguelCompany commented Jan 16, 2024

jepemi commented Jan 18, 2024

MiguelCompany commented Jan 22, 2024

JesusPoderoso commented Jan 23, 2024

jepemi commented Jan 9, 2024 •

edited by JesusPoderoso

Loading

mergify bot commented Jan 9, 2024 •

edited

Loading