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

[21506] Allow domain names (DNS) when parsing TCP locators XML elements (backport #5429) #5449

Open
wants to merge 1 commit into
base: 2.10.x
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 29, 2024

Description

Currently DNS name resolution is only attempted when parsing UDP locators from an XML profile. This PR extends that functionality to TCP locators by moving that logic to IPLocator::setIPvX(Locator_t& locator, const std::string& ipvx).

@Mergifyio backport 3.1.x 3.0.x 2.14.x 2.10.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.

  • N/A Any new configuration API has an equivalent XML API (with the corresponding XSD extension)

  • Changes are backport compatible: they do NOT break ABI nor change library core behavior.

  • 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

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • If this is a critical bug fix, backports to the critical-only supported branches have been requested.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

This is an automatic backport of pull request #5429 done by [Mergify](https://mergify.com).

* Refs #21506. Add regression tests

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #21506. Attempt DNS resolution when setting locator's IP

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #21506. Fix failing tests and apply suggestions

Signed-off-by: Juan Lopez Fernandez <[email protected]>

* Refs #21506. Apply more suggestions

Signed-off-by: Juan Lopez Fernandez <[email protected]>

---------

Signed-off-by: Juan Lopez Fernandez <[email protected]>
(cherry picked from commit 50c5848)

# Conflicts:
#	test/unittest/xmlparser/CMakeLists.txt
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Nov 29, 2024
Copy link
Contributor Author

mergify bot commented Nov 29, 2024

Cherry-pick of 50c5848 has failed:

On branch mergify/bp/2.10.x/pr-5429
Your branch is up to date with 'origin/2.10.x'.

You are currently cherry-picking commit 50c5848e2.
  (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:   src/cpp/rtps/xmlparser/XMLElementParser.cpp
	modified:   src/cpp/utils/IPLocator.cpp
	modified:   test/unittest/utils/LocatorTests.cpp
	modified:   test/unittest/xmlparser/XMLElementParserTests.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/unittest/xmlparser/CMakeLists.txt

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts Backport PR wich git cherry pick failed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant