Skip to content

[20021] TCP support for Discovery server CLI and env. var. (backport #4097) #4135

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.

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

Merged
merged 9 commits into from
Dec 21, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 14, 2023

This is an automatic backport of pull request #4097 done by Mergify.
Cherry-pick of 2653efb has failed:

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

You are currently cherry-picking commit 2653efb95.
  (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:   include/fastdds/rtps/common/Locator.h
	modified:   test/unittest/utils/LocatorTests.cpp

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   examples/C++/DDS/BasicConfigurationExample/BasicConfigurationPublisher.cpp
	both modified:   examples/C++/DDS/BasicConfigurationExample/BasicConfigurationSubscriber.cpp
	deleted by us:   examples/cpp/dds/DiscoveryServerExample/DiscoveryServerServer.cpp
	deleted by us:   examples/cpp/dds/DiscoveryServerExample/DiscoveryServer_main.cpp
	deleted by us:   examples/cpp/dds/DiscoveryServerExample/README.md
	deleted by us:   examples/cpp/dds/DiscoveryServerExample/arg_configuration.h
	deleted by us:   examples/cpp/dds/DiscoveryServerExample/common.h
	both modified:   include/fastdds/rtps/attributes/ServerAttributes.h
	both modified:   src/cpp/rtps/RTPSDomain.cpp
	both modified:   src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp
	both modified:   test/blackbox/common/BlackboxTestsDiscovery.cpp
	both modified:   tools/fds/server.cpp
	both modified:   tools/fds/server.h
	both modified:   versions.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/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

* Refs #20021: TCP support for CLI Discovery server

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

* Refs #20021: Add TCP to Discovery Server Example

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

* Refs #20021: CLI: Add argument for TCP port and example

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

* Refs #20021: Add TCP support to environment variable

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

* Refs #20021: Use autofill feature & check existing transports

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

* Refs #20021: Update BlackboxTestsDiscovery for TCPv4/6 dns support

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

* Refs #20021: Apply Revision's Suggestions

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

* Refs #20021: Add test for TCP single IP address & Fix DNS test

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

* Refs #20021: Add default TCP interface to CLI

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

* Refs #20021: Uncrustify

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

* Refs #20021: Update tests with new locator syntax & fix CLI

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

* Refs #20021: Update Readme

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

* Refs #20021: Fix warnings

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

* Refs 20021: Update versions.md

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

---------

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

# Conflicts:
#	examples/C++/DDS/BasicConfigurationExample/BasicConfigurationPublisher.cpp
#	examples/C++/DDS/BasicConfigurationExample/BasicConfigurationSubscriber.cpp
#	examples/cpp/dds/DiscoveryServerExample/DiscoveryServerServer.cpp
#	examples/cpp/dds/DiscoveryServerExample/DiscoveryServer_main.cpp
#	examples/cpp/dds/DiscoveryServerExample/README.md
#	examples/cpp/dds/DiscoveryServerExample/arg_configuration.h
#	examples/cpp/dds/DiscoveryServerExample/common.h
#	include/fastdds/rtps/attributes/ServerAttributes.h
#	src/cpp/rtps/RTPSDomain.cpp
#	src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp
#	test/blackbox/common/BlackboxTestsDiscovery.cpp
#	tools/fds/server.cpp
#	tools/fds/server.h
#	versions.md
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Dec 14, 2023
@EduPonz EduPonz added this to the v2.6.7 milestone Dec 14, 2023
Signed-off-by: cferreiragonz <[email protected]>
This reverts commit b79bbe9.
Signed-off-by: cferreiragonz <[email protected]>
@cferreiragonz cferreiragonz force-pushed the mergify/bp/2.6.x/pr-4097 branch from 62a0ad9 to f0ca969 Compare December 14, 2023 14:51
Signed-off-by: cferreiragonz <[email protected]>
@cferreiragonz cferreiragonz added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Dec 14, 2023
@MiguelCompany MiguelCompany self-requested a review December 14, 2023 15:00
Signed-off-by: cferreiragonz <[email protected]>
@cferreiragonz
Copy link
Contributor

@richiprosima please test mac please test linux please test discovery_server please check style

MiguelCompany
MiguelCompany previously approved these changes Dec 18, 2023
Signed-off-by: cferreiragonz <[email protected]>
MiguelCompany
MiguelCompany previously approved these changes Dec 18, 2023
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

Signed-off-by: cferreiragonz <[email protected]>
@cferreiragonz
Copy link
Contributor

@richiprosima please test this

@MiguelCompany
Copy link
Member

@richiprosima Please test mac

@MiguelCompany MiguelCompany merged commit 47e1161 into 2.6.x Dec 21, 2023
@MiguelCompany MiguelCompany deleted the mergify/bp/2.6.x/pr-4097 branch December 21, 2023 17:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci-pending PR which CI is running
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants