-
Notifications
You must be signed in to change notification settings - Fork 756
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 #4584
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
44a3acd
to
2753aaf
Compare
5ee5393
to
b8d7702
Compare
b8d7702
to
673328e
Compare
@cferreiragonz This has conflicts, would you mind fixing them? |
Signed-off-by: cferreiragonz <[email protected]>
Signed-off-by: cferreiragonz <[email protected]>
Signed-off-by: cferreiragonz <[email protected]>
Signed-off-by: cferreiragonz <[email protected]>
Signed-off-by: cferreiragonz <[email protected]>
Signed-off-by: cferreiragonz <[email protected]>
Signed-off-by: cferreiragonz <[email protected]>
Signed-off-by: cferreiragonz <[email protected]>
2753aaf
to
d5a6499
Compare
MiguelCompany
requested changes
Apr 3, 2024
Signed-off-by: cferreiragonz <[email protected]>
MiguelCompany
requested changes
Apr 3, 2024
Signed-off-by: cferreiragonz <[email protected]>
Signed-off-by: cferreiragonz <[email protected]>
ff26f6d
to
05dc318
Compare
MiguelCompany
previously approved these changes
Apr 3, 2024
There was a problem hiding this 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
@cferreiragonz Windows has build warnings
|
Signed-off-by: cferreiragonz <[email protected]>
@richiprosima Please test this |
CI issues looks unrelated to the PR to me. |
@Mergifyio backport 2.10.x 2.6.x |
✅ Backports have been created
|
mergify bot
pushed a commit
that referenced
this pull request
Apr 4, 2024
* 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) # Conflicts: # src/cpp/rtps/participant/RTPSParticipantImpl.cpp # src/cpp/rtps/transport/TCPTransportInterface.cpp
mergify bot
pushed a commit
that referenced
this pull request
Apr 4, 2024
* 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) # Conflicts: # src/cpp/rtps/transport/TCPTransportInterface.cpp
This was referenced Apr 4, 2024
cferreiragonz
added a commit
that referenced
this pull request
Apr 4, 2024
* 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)
cferreiragonz
added a commit
that referenced
this pull request
Apr 10, 2024
* 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)
MiguelCompany
pushed a commit
that referenced
this pull request
Apr 15, 2024
* 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)
cferreiragonz
added a commit
that referenced
this pull request
Apr 23, 2024
* 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)
cferreiragonz
added a commit
that referenced
this pull request
Apr 26, 2024
* 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)
cferreiragonz
added a commit
that referenced
this pull request
Apr 30, 2024
* 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)
cferreiragonz
added a commit
that referenced
this pull request
May 7, 2024
* 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)
EduPonz
pushed a commit
that referenced
this pull request
May 14, 2024
* 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) Co-authored-by: Carlos Ferreira González <[email protected]>
MiguelCompany
pushed a commit
that referenced
this pull request
May 16, 2024
* 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)
MiguelCompany
pushed a commit
that referenced
this pull request
May 16, 2024
* 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) Co-authored-by: Carlos Ferreira González <[email protected]>
10 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
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
versions.md
file (if applicable).Reviewer Checklist