-
Notifications
You must be signed in to change notification settings - Fork 9
Add Databroker Participant type [12151] #82
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
Open
jparisu
wants to merge
10
commits into
main
Choose a base branch
from
feature/databroker-participant
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+524
−133
Open
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
2f5f393
Refs #11770: databroker PoC
c85cf2d
Refs #11770: databroker as type and not tag
efe46ae
Refs #11770: remove unused functions
ba9969c
Refs #11770: fix yaml parse typo
82670d7
Refs #11770: Databroker implementation
661fd64
Refs #12151: apply suggestions
29e0d9e
Refs #12151: Fix compatibility with fast 2.0.x
2ac1a15
Refs #12151: Eliminate databroker tag and add discovery-server tag
b992b63
Refs #12151: apply suggestions
7435086
Refs #12151: add guid option for databroker configuration
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| /* | ||
| * Copyright 2019 Proyectos y Sistemas de Mantenimiento SL (eProsima). | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| */ | ||
|
|
||
| #include "Participant.hpp" | ||
| #include "DDSMiddlewareException.hpp" | ||
| #include "Conversion.hpp" | ||
| #include "utils/databroker/utils.hpp" | ||
|
|
||
| #include <fastdds/rtps/transport/TCPv4TransportDescriptor.h> | ||
| #include <fastdds/rtps/transport/UDPv4TransportDescriptor.h> | ||
|
|
||
| #include <fastrtps/types/DynamicDataFactory.h> | ||
| #include <fastrtps/xmlparser/XMLProfileManager.h> | ||
|
|
||
| #include <sstream> | ||
|
|
||
| namespace eprosima { | ||
| namespace is { | ||
| namespace sh { | ||
| namespace fastdds { | ||
| namespace utils { | ||
|
|
||
| eprosima::fastrtps::rtps::GuidPrefix_t guid_server( | ||
| uint8_t id) | ||
| { | ||
| eprosima::fastrtps::rtps::GuidPrefix_t guid; | ||
| std::istringstream(SERVER_DEFAULT_GUID) >> guid; | ||
| guid.value[SERVER_DEFAULT_GUID_ID_INDEX] = static_cast<unsigned char>(id); | ||
| return guid; | ||
| } | ||
|
|
||
| eprosima::fastrtps::rtps::GuidPrefix_t guid_server( | ||
| const YAML::Node& server_id, | ||
| const YAML::Node& server_guid) | ||
| { | ||
| if (server_guid) | ||
| { | ||
| // Server GUID set and used | ||
| eprosima::fastrtps::rtps::GuidPrefix_t guid; | ||
| std::istringstream(server_guid.as<std::string>()) >> guid; | ||
| return guid; // There is no easy wat to directly return the guid | ||
| } | ||
| else if (server_id && !server_guid) | ||
| { | ||
| // Server ID set without GUID set | ||
| return guid_server(server_id.as<uint32_t>() % std::numeric_limits<uint8_t>::max()); | ||
| } | ||
| else | ||
| { | ||
| // Server GUID by default with ID 0 | ||
| return guid_server(0); | ||
| } | ||
| } | ||
|
|
||
| std::string guid_to_string( | ||
| const eprosima::fastrtps::rtps::GuidPrefix_t& guid) | ||
| { | ||
| std::ostringstream guid_ostream; | ||
| guid_ostream << guid; | ||
| return guid_ostream.str(); | ||
| } | ||
|
|
||
| } // namespace utils | ||
| } // namespace fastdds | ||
| } // namespace sh | ||
| } // namespace is | ||
| } // namespace eprosima |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| // Copyright 2021 Proyectos y Sistemas de Mantenimiento SL (eProsima). | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| /** | ||
| * @file utils.hpp | ||
| * | ||
| */ | ||
|
|
||
| #ifndef _IS_SH_FASTDDS__INTERNAL__UTILS_HPP_ | ||
| #define _IS_SH_FASTDDS__INTERNAL__UTILS_HPP_ | ||
|
|
||
| #include <sstream> | ||
| #include <vector> | ||
|
|
||
| #include <fastdds/rtps/common/GuidPrefix_t.hpp> | ||
|
|
||
| namespace eprosima { | ||
| namespace is { | ||
| namespace sh { | ||
| namespace fastdds { | ||
|
|
||
| namespace utils { | ||
|
|
||
| #define SERVER_DEFAULT_GUID "01.0f.00.44.41.54.95.42.52.4f.4b.45.52" | ||
| #define SERVER_DEFAULT_GUID_ID_INDEX 2 | ||
|
|
||
| inline eprosima::fastrtps::rtps::GuidPrefix_t guid_server( | ||
| uint8_t id) | ||
| { | ||
| eprosima::fastrtps::rtps::GuidPrefix_t guid; | ||
| std::istringstream(SERVER_DEFAULT_GUID) >> guid; | ||
| guid.value[SERVER_DEFAULT_GUID_ID_INDEX] = static_cast<unsigned char>(id); | ||
| return guid; | ||
| } | ||
|
|
||
| inline eprosima::fastrtps::rtps::GuidPrefix_t guid_server( | ||
| const YAML::Node& server_id, | ||
| const YAML::Node& server_guid) | ||
| { | ||
| if (server_guid) | ||
| { | ||
| // Server GUID set and used | ||
| eprosima::fastrtps::rtps::GuidPrefix_t guid; | ||
| std::istringstream(server_guid.as<std::string>()) >> guid; | ||
| return guid; // There is no easy wat to directly return the guid | ||
| } | ||
| else if (server_id) | ||
| { | ||
| // Server ID set without GUID set | ||
| return guid_server(server_id.as<uint32_t>() % std::numeric_limits<uint8_t>::max()); | ||
| } | ||
| else | ||
| { | ||
| // Server GUID by default with ID 0 | ||
| return guid_server(0); | ||
| } | ||
| } | ||
|
|
||
| inline std::string guid_to_string( | ||
| const eprosima::fastrtps::rtps::GuidPrefix_t& guid) | ||
| { | ||
| std::ostringstream guid_ostream; | ||
| guid_ostream << guid; | ||
| return guid_ostream.str(); | ||
| } | ||
|
|
||
| } // namespace utils | ||
| } // namespace fastdds | ||
| } // namespace sh | ||
| } // namespace is | ||
| } // namespace eprosima | ||
|
|
||
| #endif // _IS_SH_FASTDDS__INTERNAL__UTILS_HPP_ |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.