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.

Sign up for GitHub

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

Jump to bottom

[16622] secure discovery server EDP exchange #3181

Merged
merged 2 commits into from
Jan 3, 2023
Merged

[16622] secure discovery server EDP exchange #3181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5be801c
Refs #16622: Enable Secure Available BuiltinPoints for a PDPServer
Mario-DL Dec 29, 2022
a773492
Revert "Refs #16603. Temporarily disabling secure endpoints on EDPCli…
Mario-DL Jan 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions src/cpp/rtps/builtin/discovery/endpoint/EDPClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ bool EDPClient::processLocalReaderProxyData(

auto* writer = &subscriptions_writer_;

// TODO(Miguel C): Re-enable this when EDPServer creates the secure EDP endpoints
#if 0 // HAVE_SECURITY
#if HAVE_SECURITY
if (local_reader->getAttributes().security_attributes().is_discovery_protected)
{
writer = &subscriptions_secure_writer_;
Expand Down Expand Up @@ -80,8 +79,7 @@ bool EDPClient::processLocalWriterProxyData(

auto* writer = &publications_writer_;

// TODO(Miguel C): Re-enable this when EDPServer creates the secure EDP endpoints
#if 0 //HAVE_SECURITY
#if HAVE_SECURITY
if (local_writer->getAttributes().security_attributes().is_discovery_protected)
{
writer = &publications_secure_writer_;
Expand Down Expand Up @@ -112,8 +110,7 @@ bool EDPClient::removeLocalWriter(

auto* writer = &publications_writer_;

// TODO(Miguel C): Re-enable this when EDPServer creates the secure EDP endpoints
#if 0 // HAVE_SECURITY
#if HAVE_SECURITY
if (W->getAttributes().security_attributes().is_discovery_protected)
{
writer = &publications_secure_writer_;
Expand Down Expand Up @@ -166,8 +163,7 @@ bool EDPClient::removeLocalReader(

auto* writer = &subscriptions_writer_;

// TODO(Miguel C): Re-enable this when EDPServer creates the secure EDP endpoints
#if 0 // HAVE_SECURITY
#if HAVE_SECURITY
if (R->getAttributes().security_attributes().is_discovery_protected)
{
writer = &subscriptions_secure_writer_;
Expand Down
10 changes: 10 additions & 0 deletions src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,16 @@ void PDPServer::initializeParticipantProxyData(
| DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_DETECTOR
| DISC_BUILTIN_ENDPOINT_PUBLICATION_DETECTOR
| DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_ANNOUNCER;
#ifdef HAVE_SECURITY
if (getRTPSParticipant()->is_secure())
{
participant_data->m_availableBuiltinEndpoints
|= DISC_BUILTIN_ENDPOINT_PUBLICATION_SECURE_ANNOUNCER
| DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_SECURE_DETECTOR
| DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_SECURE_ANNOUNCER
| DISC_BUILTIN_ENDPOINT_PUBLICATION_SECURE_DETECTOR;
}
#endif //HAVE_SECURITY

const SimpleEDPAttributes& se = getRTPSParticipant()->getAttributes().builtin.discovery_config.m_simpleEDP;

Expand Down