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

Accept v6 interfaces and interface names in whitelist [21531] (backport #128) #130

Merged
merged 1 commit into from
Sep 13, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 13, 2024

This PR removes the constraint of whitelist elements to be IPv4 addresses, accepting now IPv6 ones as well (for WAN and DiscoverServer participants only) and device names.


This is an automatic backport of pull request #128 done by Mergify.

@mergify mergify bot added the conflicts label Sep 13, 2024
Copy link
Author

mergify bot commented Sep 13, 2024

Cherry-pick of ac61a84 has failed:

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

You are currently cherry-picking commit ac61a84.
  (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:   ddspipe_participants/include/ddspipe_participants/configuration/SimpleParticipantConfiguration.hpp
	modified:   ddspipe_participants/include/ddspipe_participants/participant/rtps/CommonParticipant.hpp
	modified:   ddspipe_participants/include/ddspipe_participants/types/address/Address.hpp
	modified:   ddspipe_participants/src/cpp/configuration/SimpleParticipantConfiguration.cpp
	modified:   ddspipe_yaml/src/cpp/YamlReader_participants.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ddspipe_participants/src/cpp/participant/rtps/CommonParticipant.cpp

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

Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>
(cherry picked from commit ac61a84)

# Conflicts:
#	ddspipe_participants/src/cpp/participant/rtps/CommonParticipant.cpp
@codecov-commenter
Copy link

Codecov Report

Attention: Patch coverage is 0% with 18 lines in your changes missing coverage. Please review.

Project coverage is 34.10%. Comparing base (68162ec) to head (83b4614).

Files with missing lines Patch % Lines
...nts/src/cpp/participant/rtps/CommonParticipant.cpp 0.00% 11 Missing and 1 partial ⚠️
ddspipe_yaml/src/cpp/YamlReader_participants.cpp 0.00% 6 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##              0.x     #130      +/-   ##
==========================================
- Coverage   34.14%   34.10%   -0.04%     
==========================================
  Files         154      154              
  Lines        7875     7866       -9     
  Branches     3516     3506      -10     
==========================================
- Hits         2689     2683       -6     
+ Misses       3275     3268       -7     
- Partials     1911     1915       +4     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@juanlofer-eprosima juanlofer-eprosima merged commit 8abd633 into 0.x Sep 13, 2024
17 checks passed
@juanlofer-eprosima juanlofer-eprosima deleted the mergify/bp/0.x/pr-128 branch September 13, 2024 10:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants