-
Notifications
You must be signed in to change notification settings - Fork 775
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) #4656
Conversation
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 |
26406f0
to
bf6fac3
Compare
bf6fac3
to
c240b4e
Compare
@cferreiragonz would you mind removing conflict marks here ? Also, remember replacing |
c240b4e
to
e0adcfe
Compare
@richiprosima please test this |
It seems that there has been some errors in compilation, @cferreiragonz could you take a look at them ? |
* Refs #20628: Update OpenOutputChannel Signed-off-by: cferreiragonz <carlosferreira@eprosima.com> * Refs #20628: Refactor PDPClient to handle initial TPC connections Signed-off-by: cferreiragonz <carlosferreira@eprosima.com> * Refs #20628: Configuration to use logical port 0 as default in DS Signed-off-by: cferreiragonz <carlosferreira@eprosima.com> * Refs #20628: Refactor PDPServer to handle initial TPC connections Signed-off-by: cferreiragonz <carlosferreira@eprosima.com> * Refs #20628: Add TCP DS blackbox test Signed-off-by: cferreiragonz <carlosferreira@eprosima.com> * Refs #20628: Uncrustify Signed-off-by: cferreiragonz <carlosferreira@eprosima.com> * Refs #20628: Check transport in function Signed-off-by: cferreiragonz <carlosferreira@eprosima.com> * Refs #20628: Check interface changes before creating new send resources Signed-off-by: cferreiragonz <carlosferreira@eprosima.com> * Refs #20628: Minor corrections Signed-off-by: cferreiragonz <carlosferreira@eprosima.com> * Refs #20628: Check loc.kind and methods in RTPSPartImpl Signed-off-by: cferreiragonz <carlosferreira@eprosima.com> * Refs #20628: Check loc.kind for default logical port Signed-off-by: cferreiragonz <carlosferreira@eprosima.com> * Refs #20628: Fix windows Signed-off-by: cferreiragonz <carlosferreira@eprosima.com> --------- Signed-off-by: cferreiragonz <carlosferreira@eprosima.com> (cherry picked from commit 9ff962c)
e0adcfe
to
032d791
Compare
@richiprosima please test this |
@richiprosima please test windows |
Failing tests unrelated to this PR, the |
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).