[20238] Enabling multiple interfaces through whitelist in TCP servers #4297

cferreiragonz · 2024-01-26T09:41:43Z

Description

This pull request addresses a bug related to the initialization of TCP servers when multiple interfaces are added to the whitelist. The issue stemmed from the unnoticed overwriting of the acceptors_ map because of the comparison of locators without properly setting their addresses.

@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.
The title and description correctly express the PR's purpose.
Check contributor checklist is correct.
Check CI results: changes do not issue any warning.
Check CI results: failing tests are unrelated with the changes.

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

cferreiragonz · 2024-02-20T06:54:39Z

@richiprosima please test this

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

src/cpp/rtps/transport/TCPTransportInterface.cpp

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

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

EduPonz · 2024-02-20T14:32:19Z

@richiprosima please test this

MiguelCompany · 2024-02-20T15:01:45Z

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

mergify · 2024-02-20T15:01:57Z

backport 2.12.x 2.10.x 2.6.x

✅ Backports have been created

#4412 [20238] Enabling multiple interfaces through whitelist in TCP servers (backport #4297) has been created for branch 2.12.x but encountered conflicts
#4413 [20238] Enabling multiple interfaces through whitelist in TCP servers (backport #4297) has been created for branch 2.10.x but encountered conflicts
#4414 [20238] Enabling multiple interfaces through whitelist in TCP servers (backport #4297) has been created for branch 2.6.x but encountered conflicts

* Refs #20238: Add whitelist test in TCPv4 Signed-off-by: cferreiragonz <[email protected]> * Refs #20238: Add whitelist test in TCPv6 Signed-off-by: cferreiragonz <[email protected]> * Refs #20238: Adding interface to locator if whitelist is not empty Signed-off-by: cferreiragonz <[email protected]> * Refs #20238: Uncrustify Signed-off-by: cferreiragonz <[email protected]> * Refs #20238: Fix build in Windows Signed-off-by: cferreiragonz <[email protected]> * Refs #20238: Apply suggestions Signed-off-by: cferreiragonz <[email protected]> * Refs #20238: Remove repeated addition of listener port (added by default) Signed-off-by: cferreiragonz <[email protected]> --------- Signed-off-by: cferreiragonz <[email protected]> (cherry picked from commit 5f65a65)

#4413) * TCP Client&Server Participant Decision-Making (#4277) * Refs #20180: Spelling fix Signed-off-by: cferreiragonz <[email protected]> * Refs #20180: Create function to check pending_logical_ports Signed-off-by: cferreiragonz <[email protected]> * Refs #20180: Add new TCP Connection type Signed-off-by: cferreiragonz <[email protected]> * Refs #20180: Add new method to enable TCP channel after connection in LARGE DATA Signed-off-by: cferreiragonz <[email protected]> * Refs #20180: Refactor OpenOutputChannel method Signed-off-by: cferreiragonz <[email protected]> * Refs #20180: Include LARGE DATA logic in SocketAccepted method Signed-off-by: cferreiragonz <[email protected]> * Refs #20180: Include LARGE DATA logic in processBindConnectionRequest method Signed-off-by: cferreiragonz <[email protected]> * Refs #20180: Add new TCP connection and methods SECURITY Signed-off-by: cferreiragonz <[email protected]> * Refs #20180: Add SECURITY support to OpenOutputChannel Signed-off-by: cferreiragonz <[email protected]> * Refs #20180: Include LARGE DATA logic in SecureSocketAccepted method Signed-off-by: cferreiragonz <[email protected]> * Refs #20180: Bugfix setting environment variable in tests Signed-off-by: cferreiragonz <[email protected]> * Refs #20180: Add multicast IPv6 to LARGE_DATA locator Signed-off-by: cferreiragonz <[email protected]> * Refs #20180: Add TCP test in LARGE_DATA Topology Signed-off-by: cferreiragonz <[email protected]> * Refs #20180: Clean code & Uncrustify Signed-off-by: cferreiragonz <[email protected]> * Refs #20180: Modified participant populated test Signed-off-by: Jesus Perez <[email protected]> * Refs #20180: Add new api to update channels Signed-off-by: cferreiragonz <[email protected]> * Refs #20180: Refactor OpenOutputChannel with new channel map Signed-off-by: cferreiragonz <[email protected]> * Refs #20180: Refactor bind_socket with new channel map Signed-off-by: cferreiragonz <[email protected]> * Refs #20180: Refactor SocketAccepted with new channel map (Revert to old behavior) Signed-off-by: cferreiragonz <[email protected]> * Refs #20180: Refactor CloseOutputChannel to support cases with new channel map Signed-off-by: cferreiragonz <[email protected]> * Refs #20180: Update Secure channel logic with new channel map Signed-off-by: cferreiragonz <[email protected]> * Refs #20180: Use same IPv6 as defaultMetatrafficMulticast Signed-off-by: cferreiragonz <[email protected]> * Refs #20180: Refactor using locator inside sender resource instead of channel Signed-off-by: cferreiragonz <[email protected]> * Refs #20180: Data races associated Signed-off-by: cferreiragonz <[email protected]> * Refs #20180: Apply suggestions to tests Signed-off-by: Jesus Perez <[email protected]> * Refs #20180: Add OpenLogicalPortRequest scenario before Bind Response is processed Signed-off-by: cferreiragonz <[email protected]> * Refs #20180. Remove unnecessary methods. Signed-off-by: Miguel Company <[email protected]> * Refs #20180. Early exit when logical_port is 0. Signed-off-by: Miguel Company <[email protected]> * Refs #20180. Refactor to avoid lambda. Signed-off-by: Miguel Company <[email protected]> * Refs #20180. Minor changes. Signed-off-by: Miguel Company <[email protected]> * Refs #20180. Simplify with WanToLanLocator. Signed-off-by: Miguel Company <[email protected]> * Refs #20180: Apply suggestions Signed-off-by: cferreiragonz <[email protected]> * Revert "Refs #20180: Add new TCP Connection type" This reverts commit 4b4eb4153553cfdbf007896ff524d3e904f722c9. Signed-off-by: cferreiragonz <[email protected]> * Refs #20180: Remove unnecessary lock Signed-off-by: cferreiragonz <[email protected]> * Revert "Refs #20180: Add new TCP connection and methods SECURITY" This reverts commit c69d92e56dcfab3c3c7287145a7a93e57947d3cb. Signed-off-by: cferreiragonz <[email protected]> * Refs #20180: Fix test (file descriptors limit) Signed-off-by: Jesus Perez <[email protected]> * Refs #20180: Uncrustify Signed-off-by: Jesus Perez <[email protected]> * Refs #20180. Fix port comparison. Signed-off-by: Miguel Company <[email protected]> Co-authored-by: Carlos Ferreira González <[email protected]> * Refs #20180: Fix double lock and update old test with current behavior Signed-off-by: Jesus Perez <[email protected]> * Refs #20180: Apply suggestions Signed-off-by: Jesus Perez <[email protected]> * Refs #20180: Fix windows test build Signed-off-by: Jesus Perez <[email protected]> * Refs #20180: Apply test suggestions Signed-off-by: Jesus Perez <[email protected]> * Refs #20180: Bugfix with cv in receiver_resources_ destruction Signed-off-by: cferreiragonz <[email protected]> * Refs #20180. Delete participant on failing ParticipantTests.ParticipantCreationWithBuiltinTransport Signed-off-by: Miguel Company <[email protected]> * Refs #20180. Do not use non_blocking_send on TCP transport for LARGE_DATA. Signed-off-by: Miguel Company <[email protected]> --------- Signed-off-by: cferreiragonz <[email protected]> Signed-off-by: Jesus Perez <[email protected]> Signed-off-by: Miguel Company <[email protected]> Co-authored-by: Jesus Perez <[email protected]> Co-authored-by: Miguel Company <[email protected]> (cherry picked from commit 709b140) # Conflicts: # test/blackbox/common/BlackboxTestsTransportTCP.cpp * Fix Conflicts Signed-off-by: cferreiragonz <[email protected]> * Enabling multiple interfaces through whitelist in TCP servers (#4297) * Refs #20238: Add whitelist test in TCPv4 Signed-off-by: cferreiragonz <[email protected]> * Refs #20238: Add whitelist test in TCPv6 Signed-off-by: cferreiragonz <[email protected]> * Refs #20238: Adding interface to locator if whitelist is not empty Signed-off-by: cferreiragonz <[email protected]> * Refs #20238: Uncrustify Signed-off-by: cferreiragonz <[email protected]> * Refs #20238: Fix build in Windows Signed-off-by: cferreiragonz <[email protected]> * Refs #20238: Apply suggestions Signed-off-by: cferreiragonz <[email protected]> * Refs #20238: Remove repeated addition of listener port (added by default) Signed-off-by: cferreiragonz <[email protected]> --------- Signed-off-by: cferreiragonz <[email protected]> (cherry picked from commit 5f65a65) * Fix conflicts Signed-off-by: cferreiragonz <[email protected]> --------- Signed-off-by: cferreiragonz <[email protected]> Co-authored-by: Carlos Ferreira González <[email protected]>

* Refs #20238: Add whitelist test in TCPv4 Signed-off-by: cferreiragonz <[email protected]> * Refs #20238: Add whitelist test in TCPv6 Signed-off-by: cferreiragonz <[email protected]> * Refs #20238: Adding interface to locator if whitelist is not empty Signed-off-by: cferreiragonz <[email protected]> * Refs #20238: Uncrustify Signed-off-by: cferreiragonz <[email protected]> * Refs #20238: Fix build in Windows Signed-off-by: cferreiragonz <[email protected]> * Refs #20238: Apply suggestions Signed-off-by: cferreiragonz <[email protected]> * Refs #20238: Remove repeated addition of listener port (added by default) Signed-off-by: cferreiragonz <[email protected]> --------- Signed-off-by: cferreiragonz <[email protected]> (cherry picked from commit 5f65a65) Fix Ipv6 names Signed-off-by: cferreiragonz <[email protected]>

…#4412) * Refs #20238: Add whitelist test in TCPv4 * Refs #20238: Add whitelist test in TCPv6 * Refs #20238: Adding interface to locator if whitelist is not empty * Refs #20238: Uncrustify * Refs #20238: Fix build in Windows * Refs #20238: Apply suggestions * Refs #20238: Remove repeated addition of listener port (added by default) --------- (cherry picked from commit 5f65a65) Fix Ipv6 names Signed-off-by: cferreiragonz <[email protected]> Co-authored-by: Carlos Ferreira González <[email protected]>

* Refs #20238: Add whitelist test in TCPv4 Signed-off-by: cferreiragonz <[email protected]> * Refs #20238: Add whitelist test in TCPv6 Signed-off-by: cferreiragonz <[email protected]> * Refs #20238: Adding interface to locator if whitelist is not empty Signed-off-by: cferreiragonz <[email protected]> * Refs #20238: Uncrustify Signed-off-by: cferreiragonz <[email protected]> * Refs #20238: Fix build in Windows Signed-off-by: cferreiragonz <[email protected]> * Refs #20238: Apply suggestions Signed-off-by: cferreiragonz <[email protected]> * Refs #20238: Remove repeated addition of listener port (added by default) Signed-off-by: cferreiragonz <[email protected]> --------- Signed-off-by: cferreiragonz <[email protected]> (cherry picked from commit 5f65a65)

…#4414) * Enabling multiple interfaces through whitelist in TCP servers (#4297) * Refs #20238: Add whitelist test in TCPv4 Signed-off-by: cferreiragonz <[email protected]> * Refs #20238: Add whitelist test in TCPv6 Signed-off-by: cferreiragonz <[email protected]> * Refs #20238: Adding interface to locator if whitelist is not empty Signed-off-by: cferreiragonz <[email protected]> * Refs #20238: Uncrustify Signed-off-by: cferreiragonz <[email protected]> * Refs #20238: Fix build in Windows Signed-off-by: cferreiragonz <[email protected]> * Refs #20238: Apply suggestions Signed-off-by: cferreiragonz <[email protected]> * Refs #20238: Remove repeated addition of listener port (added by default) Signed-off-by: cferreiragonz <[email protected]> --------- Signed-off-by: cferreiragonz <[email protected]> (cherry picked from commit 5f65a65) * Fix Conflicts pr-4217 Signed-off-by: cferreiragonz <[email protected]> --------- Signed-off-by: cferreiragonz <[email protected]> Co-authored-by: Carlos Ferreira González <[email protected]>

cferreiragonz added this to the v2.13.2 milestone Jan 26, 2024

cferreiragonz requested a review from MiguelCompany January 26, 2024 09:41

JesusPoderoso added the needs-review PR that is ready to be reviewed label Jan 29, 2024

EduPonz modified the milestones: v2.13.2, v2.13.3 Feb 1, 2024

cferreiragonz added 3 commits February 19, 2024 09:21

Refs #20238: Add whitelist test in TCPv4

be1481e

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

Refs #20238: Add whitelist test in TCPv6

d64a9da

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

Refs #20238: Adding interface to locator if whitelist is not empty

6e523a2

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

cferreiragonz force-pushed the bugfix/wifi-eth-whitelist branch from 0fba001 to 6e523a2 Compare February 19, 2024 08:23

Refs #20238: Uncrustify

230a418

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

jepemi mentioned this pull request Feb 19, 2024

[20313] Allow single listening port on TCP #4348

Merged

13 tasks

Refs #20238: Fix build in Windows

60d022e

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

MiguelCompany requested changes Feb 20, 2024

View reviewed changes

src/cpp/rtps/transport/TCPTransportInterface.cpp Outdated Show resolved Hide resolved

cferreiragonz added 2 commits February 20, 2024 14:46

Refs #20238: Apply suggestions

20eff44

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

Refs #20238: Remove repeated addition of listener port (added by defa…

81c4f4b

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

MiguelCompany approved these changes Feb 20, 2024

View reviewed changes

EduPonz added ci-pending PR which CI is running and removed needs-review PR that is ready to be reviewed labels Feb 20, 2024

EduPonz 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 Feb 21, 2024

MiguelCompany merged commit 5f65a65 into master Feb 21, 2024
12 of 17 checks passed

MiguelCompany deleted the bugfix/wifi-eth-whitelist branch February 21, 2024 06:44

mergify bot mentioned this pull request Feb 21, 2024

[20238] Enabling multiple interfaces through whitelist in TCP servers (backport #4297) #4412

Merged

mergify bot mentioned this pull request Feb 21, 2024

[20238] Enabling multiple interfaces through whitelist in TCP servers (backport #4297) #4413

Merged

mergify bot mentioned this pull request Feb 21, 2024

[20238] Enabling multiple interfaces through whitelist in TCP servers (backport #4297) #4414

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[20238] Enabling multiple interfaces through whitelist in TCP servers #4297

[20238] Enabling multiple interfaces through whitelist in TCP servers #4297

cferreiragonz commented Jan 26, 2024 •

edited by MiguelCompany

Loading

cferreiragonz commented Feb 20, 2024

EduPonz commented Feb 20, 2024

MiguelCompany commented Feb 20, 2024

mergify bot commented Feb 20, 2024 •

edited

Loading

[20238] Enabling multiple interfaces through whitelist in TCP servers #4297

[20238] Enabling multiple interfaces through whitelist in TCP servers #4297

Conversation

cferreiragonz commented Jan 26, 2024 • edited by MiguelCompany Loading

Description

Contributor Checklist

Reviewer Checklist

cferreiragonz commented Feb 20, 2024

EduPonz commented Feb 20, 2024

MiguelCompany commented Feb 20, 2024

mergify bot commented Feb 20, 2024 • edited Loading

✅ Backports have been created

cferreiragonz commented Jan 26, 2024 •

edited by MiguelCompany

Loading

mergify bot commented Feb 20, 2024 •

edited

Loading