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

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

Merged
merged 4 commits into from
Mar 8, 2024
Merged

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

merged 4 commits into from
Mar 8, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 21, 2024

This is an automatic backport of pull request #4297 done by Mergify.
Cherry-pick of 5f65a65 has failed:

On branch mergify/bp/2.10.x/pr-4297
Your branch is up to date with 'origin/2.10.x'.

You are currently cherry-picking commit 5f65a6519.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/cpp/rtps/transport/TCPTransportInterface.cpp
	modified:   test/unittest/transport/TCPv6Tests.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/unittest/transport/TCPv4Tests.cpp
	both modified:   test/unittest/transport/mock/MockTCPv4Transport.h
	both modified:   test/unittest/transport/mock/MockTCPv6Transport.h

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Feb 21, 2024
@mergify mergify bot mentioned this pull request Feb 21, 2024
Merged
11 tasks
@EduPonz EduPonz added this to the v2.10.4 milestone Feb 21, 2024
@MiguelCompany
Copy link
Member

This depends on #4385, and fixing conflicts should wait until that one is merged

@cferreiragonz cferreiragonz added ci-pending PR which CI is running temporarily-blocked PR must be merged after another one and removed conflicts Backport PR wich git cherry pick failed needs rebase labels Mar 1, 2024
@cferreiragonz
TCP Client&Server Participant Decision-Making (#4277)
297626b 
* Refs #20180: Spelling fix

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

* Refs #20180: Create function to check pending_logical_ports

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

* Refs #20180: Add new TCP Connection type

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

* Refs #20180: Add new method to enable TCP channel after connection in LARGE DATA

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

* Refs #20180: Refactor OpenOutputChannel method

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

* Refs #20180: Include LARGE DATA logic in SocketAccepted method

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

* Refs #20180: Include LARGE DATA logic in processBindConnectionRequest method

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

* Refs #20180: Add new TCP connection and methods SECURITY

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

* Refs #20180: Add SECURITY support to OpenOutputChannel

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

* Refs #20180: Include LARGE DATA logic in SecureSocketAccepted method

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

* Refs #20180: Bugfix setting environment variable in tests

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

* Refs #20180: Add multicast IPv6 to LARGE_DATA locator

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

* Refs #20180: Add TCP test in LARGE_DATA Topology

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

* Refs #20180: Clean code & Uncrustify

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

* Refs #20180: Modified participant populated test

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

* Refs #20180: Add new api to update channels

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

* Refs #20180: Refactor OpenOutputChannel with new channel map

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

* Refs #20180: Refactor bind_socket with new channel map

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

* Refs #20180: Refactor SocketAccepted with new channel map (Revert to old behavior)

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

* Refs #20180: Refactor CloseOutputChannel to support cases with new channel map

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

* Refs #20180: Update Secure channel logic with new channel map

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

* Refs #20180: Use same IPv6 as defaultMetatrafficMulticast

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

* Refs #20180: Refactor using locator inside sender resource instead of channel

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

* Refs #20180: Data races associated

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

* Refs #20180: Apply suggestions to tests

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

* Refs #20180: Add OpenLogicalPortRequest scenario before Bind Response is processed

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

* Refs #20180. Remove unnecessary methods.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #20180. Early exit when logical_port is 0.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #20180. Refactor to avoid lambda.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #20180. Minor changes.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #20180. Simplify with WanToLanLocator.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #20180: Apply suggestions

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

* Revert "Refs #20180: Add new TCP Connection type"

This reverts commit 4b4eb4153553cfdbf007896ff524d3e904f722c9.

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

* Refs #20180: Remove unnecessary lock

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

* Revert "Refs #20180: Add new TCP connection and methods SECURITY"

This reverts commit c69d92e56dcfab3c3c7287145a7a93e57947d3cb.

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

* Refs #20180: Fix test (file descriptors limit)

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

* Refs #20180: Uncrustify

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

* Refs #20180. Fix port comparison.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

Co-authored-by: Carlos Ferreira González <carlosferreira@eprosima.com>

* Refs #20180: Fix double lock and update old test with current behavior

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

* Refs #20180: Apply suggestions

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

* Refs #20180: Fix windows test build

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

* Refs #20180: Apply test suggestions

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

* Refs #20180: Bugfix with cv in receiver_resources_ destruction

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

* Refs #20180. Delete participant on failing ParticipantTests.ParticipantCreationWithBuiltinTransport

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #20180. Do not use non_blocking_send on TCP transport for LARGE_DATA.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

---------

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Co-authored-by: Jesus Perez <jesusperez@eprosima.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 709b140)

# Conflicts:
#	test/blackbox/common/BlackboxTestsTransportTCP.cpp
@cferreiragonz
Fix Conflicts
6ba0a55 
Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
@cferreiragonz
Enabling multiple interfaces through whitelist in TCP servers (#4297)
e4c3f3e 
* Refs #20238: Add whitelist test in TCPv4

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

* Refs #20238: Add whitelist test in TCPv6

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

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

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

* Refs #20238: Uncrustify

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

* Refs #20238: Fix build in Windows

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

* Refs #20238: Apply suggestions

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

* Refs #20238: Remove repeated addition of listener port (added by default)

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

---------

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
(cherry picked from commit 5f65a65)
@cferreiragonz
Fix conflicts
095e150 
Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
@cferreiragonz cferreiragonz changed the base branch from 2.10.x to mergify/bp/2.10.x/pr-4277 March 1, 2024 12:45
@cferreiragonz
Copy link
Contributor

@jepemi jepemi mentioned this pull request Mar 1, 2024
Merged
Base automatically changed from mergify/bp/2.10.x/pr-4277 to 2.10.x March 7, 2024 06:50
@MiguelCompany MiguelCompany removed the temporarily-blocked PR must be merged after another one label Mar 7, 2024
@MiguelCompany
Copy link
Member

@richiprosima Please test this

@eProsima eProsima deleted a comment from mergify bot Mar 8, 2024
@MiguelCompany
Copy link
Member

@richiprosima Please test mac

@MiguelCompany MiguelCompany merged commit 9fc686b into 2.10.x Mar 8, 2024
10 of 16 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.10.x/pr-4297 branch March 8, 2024 22:24
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
ci-pending PR which CI is running
Projects
None yet
Milestone
v2.10.4
Development

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