[19665] Hotfix TCP sender resources creation #3932

Mario-DL · 2023-10-16T08:38:23Z

Description

This PR fixes an incorrect behavior when a TCP client receives the discovery information from a TCP server with a WAN configured in the locator. It creates more sender resources than needed as it fails to recognize that the ones already created were matching the target ones.

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

…Resource to avoid failing the cast Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

Mario-DL · 2023-10-16T13:54:04Z

@richiprosima please test mac

src/cpp/utils/IPLocator.cpp

src/cpp/rtps/transport/TCPSenderResource.hpp

src/cpp/rtps/transport/UDPSenderResource.hpp

src/cpp/rtps/transport/shared_mem/SharedMemSenderResource.hpp

test/blackbox/common/BlackboxTestsTransportCustom.cpp

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

Mario-DL · 2023-10-25T14:22:23Z

@richiprosima please test this

Mario-DL · 2023-10-26T12:34:21Z

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

mergify · 2023-10-26T12:34:29Z

backport 2.11.x 2.10.x 2.6.x

✅ Backports have been created

#3962 [19665] Hotfix TCP sender resources creation (backport #3932) has been created for branch 2.11.x
#3963 [19665] Hotfix TCP sender resources creation (backport #3932) has been created for branch 2.10.x
#3964 [19665] Hotfix TCP sender resources creation (backport #3932) has been created for branch 2.6.x but encountered conflicts

* Refs #19665: Check if casting from a ChainingSender instead of SenderResource to avoid failing the cast Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #19665: Regression test Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #19665: Check if remote WAN sender resource already exists Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #19655: Linter Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #19665: fix test mac vars init Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #19665: Apply Rev suggestions Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> (cherry picked from commit e94deb8)

* Refs #19665: Check if casting from a ChainingSender instead of SenderResource to avoid failing the cast Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #19665: Regression test Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #19665: Check if remote WAN sender resource already exists Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #19655: Linter Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #19665: fix test mac vars init Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #19665: Apply Rev suggestions Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> (cherry picked from commit e94deb8) # Conflicts: # src/cpp/rtps/transport/TCPSenderResource.hpp # src/cpp/rtps/transport/shared_mem/SharedMemSenderResource.hpp

* Refs #19665: Check if casting from a ChainingSender instead of SenderResource to avoid failing the cast Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #19665: Regression test Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #19665: Check if remote WAN sender resource already exists Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #19655: Linter Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #19665: fix test mac vars init Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #19665: Apply Rev suggestions Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> (cherry picked from commit e94deb8) Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com>

* Hotfix TCP sender resources creation (#3932) * Refs #19665: Check if casting from a ChainingSender instead of SenderResource to avoid failing the cast Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #19665: Regression test Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #19665: Check if remote WAN sender resource already exists Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #19655: Linter Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #19665: fix test mac vars init Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> * Refs #19665: Apply Rev suggestions Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> (cherry picked from commit e94deb8) # Conflicts: # src/cpp/rtps/transport/TCPSenderResource.hpp # src/cpp/rtps/transport/shared_mem/SharedMemSenderResource.hpp * Fix conflicts Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> --------- Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com> Co-authored-by: Mario Domínguez López <116071334+Mario-DL@users.noreply.github.com> Co-authored-by: Mario Dominguez <mariodominguez@eprosima.com>

Mario-DL added 3 commits October 16, 2023 09:48

Refs #19665: Check if casting from a ChainingSender instead of Sender…

9d3fb10

…Resource to avoid failing the cast Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

Refs #19665: Regression test

6de1230

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

Refs #19665: Check if remote WAN sender resource already exists

5146b12

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

Mario-DL added this to the v2.12.1 milestone Oct 16, 2023

Mario-DL added 2 commits October 16, 2023 10:45

Refs #19655: Linter

3018fa4

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

Refs #19665: fix test mac vars init

b542c31

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

Mario-DL changed the title ~~[19655] Hotfix TCP sender resources creation~~ [19665] Hotfix TCP sender resources creation Oct 24, 2023

richiware requested changes Oct 24, 2023

View reviewed changes

Refs #19665: Apply Rev suggestions

7e84dff

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

richiware approved these changes Oct 26, 2023

View reviewed changes

Mario-DL added the ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. label Oct 26, 2023

MiguelCompany merged commit e94deb8 into master Oct 26, 2023
11 of 14 checks passed

MiguelCompany deleted the hotfix/tcp_sender_resources branch October 26, 2023 11:16

This was referenced Oct 26, 2023

[19665] Hotfix TCP sender resources creation (backport #3932) #3962

Merged

[19665] Hotfix TCP sender resources creation (backport #3932) #3963

Merged

[19665] Hotfix TCP sender resources creation (backport #3932) #3964

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[19665] Hotfix TCP sender resources creation #3932

[19665] Hotfix TCP sender resources creation #3932

Mario-DL commented Oct 16, 2023

Mario-DL commented Oct 16, 2023

Mario-DL commented Oct 25, 2023

Mario-DL commented Oct 26, 2023

mergify bot commented Oct 26, 2023 •

edited

Loading

[19665] Hotfix TCP sender resources creation #3932

[19665] Hotfix TCP sender resources creation #3932

Conversation

Mario-DL commented Oct 16, 2023

Description

Contributor Checklist

Reviewer Checklist

Mario-DL commented Oct 16, 2023

Mario-DL commented Oct 25, 2023

Mario-DL commented Oct 26, 2023

mergify bot commented Oct 26, 2023 • edited Loading

✅ Backports have been created

mergify bot commented Oct 26, 2023 •

edited

Loading