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.

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

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

Merged
merged 2 commits into from
Dec 18, 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.11.x/pr-4097
Your branch is up to date with 'origin/2.11.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:   examples/cpp/dds/DiscoveryServerExample/DiscoveryServerPublisher.cpp
	modified:   examples/cpp/dds/DiscoveryServerExample/DiscoveryServerServer.cpp
	modified:   examples/cpp/dds/DiscoveryServerExample/DiscoveryServerSubscriber.cpp
	modified:   examples/cpp/dds/DiscoveryServerExample/DiscoveryServer_main.cpp
	modified:   examples/cpp/dds/DiscoveryServerExample/README.md
	modified:   examples/cpp/dds/DiscoveryServerExample/arg_configuration.h
	modified:   examples/cpp/dds/DiscoveryServerExample/common.h
	modified:   include/fastdds/rtps/attributes/ServerAttributes.h
	modified:   include/fastdds/rtps/common/Locator.h
	modified:   src/cpp/rtps/RTPSDomain.cpp
	modified:   src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp
	modified:   test/blackbox/common/BlackboxTestsDiscovery.cpp
	modified:   test/unittest/utils/LocatorTests.cpp
	modified:   tools/fds/server.cpp
	modified:   tools/fds/server.h

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	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 <carlosferreira@eprosima.com>

* Refs #20021: Add TCP to Discovery Server Example

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

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

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

* Refs #20021: Add TCP support to environment variable

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

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

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

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

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

* Refs #20021: Apply Revision's Suggestions

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

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

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

* Refs #20021: Add default TCP interface to CLI

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

* Refs #20021: Uncrustify

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

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

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

* Refs #20021: Update Readme

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

* Refs #20021: Fix warnings

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

* Refs 20021: Update versions.md

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

---------

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
(cherry picked from commit 2653efb)

# Conflicts:
#	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.11.3 milestone Dec 14, 2023
@cferreiragonz cferreiragonz added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Dec 14, 2023
Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
@cferreiragonz
Copy link
Contributor

@richiprosima please test this

@JesusPoderoso
Copy link
Contributor

CI errors seems unrelated
Ready to merge!

@JesusPoderoso 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 Dec 16, 2023
@EduPonz EduPonz merged commit afe455f into 2.11.x Dec 18, 2023
8 of 13 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.11.x/pr-4097 branch December 18, 2023 06:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants