-
Notifications
You must be signed in to change notification settings - Fork 783
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
[20628] Fix Discovery Server over TCP using logical port (backport #4584) #4655
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Cherry-pick of 9ff962c has failed:
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 |
12 tasks
cferreiragonz
force-pushed
the
mergify/bp/2.10.x/pr-4584
branch
from
April 4, 2024 13:35
6aae158
to
796f824
Compare
MiguelCompany
force-pushed
the
mergify/bp/2.10.x/pr-4454
branch
from
April 7, 2024 11:16
bf8ad84
to
5729baa
Compare
@cferreiragonz #4560 was merged and this now needs a rebase |
cferreiragonz
force-pushed
the
mergify/bp/2.10.x/pr-4584
branch
from
April 10, 2024 06:52
796f824
to
266cea9
Compare
MiguelCompany
removed
the
temporarily-blocked
PR must be merged after another one
label
Apr 10, 2024
MiguelCompany
approved these changes
Apr 10, 2024
@Mergifyio rebase |
✅ Branch has been successfully rebased |
MiguelCompany
force-pushed
the
mergify/bp/2.10.x/pr-4584
branch
from
April 15, 2024 07:26
266cea9
to
8e0c569
Compare
@Mergifyio rebase |
* Refs #20628: Update OpenOutputChannel Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Refactor PDPClient to handle initial TPC connections Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Configuration to use logical port 0 as default in DS Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Refactor PDPServer to handle initial TPC connections Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Add TCP DS blackbox test Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Uncrustify Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Check transport in function Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Check interface changes before creating new send resources Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Minor corrections Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Check loc.kind and methods in RTPSPartImpl Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Check loc.kind for default logical port Signed-off-by: cferreiragonz <[email protected]> * Refs #20628: Fix windows Signed-off-by: cferreiragonz <[email protected]> --------- Signed-off-by: cferreiragonz <[email protected]> (cherry picked from commit 9ff962c)
✅ Branch has been successfully rebased |
MiguelCompany
force-pushed
the
mergify/bp/2.10.x/pr-4584
branch
from
May 16, 2024 05:58
8e0c569
to
a358556
Compare
MiguelCompany
requested review from
MiguelCompany
and removed request for
MiguelCompany
May 16, 2024 05:58
@richiprosima Please test this |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR fixes a couple of bugs appearing when launching Discovery Server with TCP.
Additionally, it enables to set the logical port to zero when using DS, which will set the logical port to a value equal to the physical port. This simplifies the configuration required for using DS and is coherent with the logic implement in the CLI and the ROS_DISCOVERY_SERVER environment variable, where the logical port is always set to same value as the physical port.
@Mergifyio backport 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
This is an automatic backport of pull request #4584 done by [Mergify](https://mergify.com).