Reject locators with port = 0 #1780
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
Signed-off-by: Erik Boasson <[email protected]>
Signed-off-by: Erik Boasson <[email protected]>
dpotman
reviewed
Jul 27, 2023
src/core/ddsi/src/ddsi__tran.h
Outdated
| @@ -252,15 +252,15 @@ inline dds_return_t ddsi_factory_create_conn (struct ddsi_tran_conn **conn, stru | |||
| *conn = NULL; | |||
| if ((qos->m_interface != NULL) != (qos->m_purpose == DDSI_TRAN_QOS_XMIT_UC || qos->m_purpose == DDSI_TRAN_QOS_XMIT_MC)) | |||
| return DDS_RETCODE_BAD_PARAMETER; | |||
| if (!ddsi_is_valid_port (factory, port)) | |||
| if (port != 0 && !ddsi_is_valid_port (factory, port)) | |||
There was a problem hiding this comment.
This condition (and the ones below) confused me a bit, because port number 0 was rejected earlier in the check in do_locator. Because at this point the 0 has a special meaning for the underlying implementation, I think it would be more clear to replace it with a #define with a descriptive name.
Signed-off-by: Erik Boasson <[email protected]>
dpotman
approved these changes
Jul 27, 2023
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.
This PR prevents Cyclone from accepting locators with port = 0 and so should take care of the error messages reported in #1772. The other problems caused by accepting incorrect locators can't be fixed so easily.