Skip to content

[23712] Add new XML tags #6051

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

Merged
merged 2 commits into from
Sep 25, 2025
+12 −2
Merged

[23712] Add new XML tags #6051

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
6abfca1
Refs #23645. Add new tags in XMLParser
richiware Sep 19, 2025
acf459a
Refs #23645. Update XSD
richiware Sep 19, 2025
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
9 changes: 8 additions & 1 deletion resources/xsd/fastdds_profiles.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -948,7 +948,10 @@
├ dump_thread [threadSettingsType] (ONLY available for SHM type)
├ eth_interface_name [string] (ONLY available for ETH type)
├ eth_output_port [uint16] (ONLY available for ETH type)
└ eth_priority_mappings [ethernetPriorityMappingsType] (ONLY available for ETH type)
├ eth_priority_mappings [ethernetPriorityMappingsType] (ONLY available for ETH type)
└ low_level_transport [string] (ONLY available for PAYLOAD_COMPRESSION
HEADER_REDUCTION
SOURCE_TIMESTAMP types)
-->
<!-- TODO: How to ensure all elements are declared properly (UDP only, TCP only, etc...)? -->
<xs:complexType name="transportDescriptorType">
Expand All @@ -963,6 +966,9 @@
<xs:enumeration value="TCPv6"/>
<xs:enumeration value="SHM"/>
<xs:enumeration value="ETH"/>
<xs:enumeration value="PAYLOAD_COMPRESSION"/>
<xs:enumeration value="HEADER_REDUCTION"/>
<xs:enumeration value="SOURCE_TIMESTAMP"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
Expand Down Expand Up @@ -1028,6 +1034,7 @@
<xs:element name="eth_interface_name" type="string" minOccurs="0" maxOccurs="1"/>
<xs:element name="eth_output_port" type="uint16" minOccurs="0" maxOccurs="1"/>
<xs:element name="eth_priority_mappings" type="ethernetPriorityMappingsType" minOccurs="0" maxOccurs="1"/>
<xs:element name="low_level_transport" type="string" minOccurs="0" maxOccurs="1"/>
</xs:all>
</xs:complexType>

Expand Down
3 changes: 2 additions & 1 deletion src/cpp/xmlparser/XMLParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,8 @@ XMLP_ret XMLParser::validateXMLTransportElements(
strcmp(name, SEGMENT_OVERFLOW_POLICY) == 0 ||
strcmp(name, ETH_INTERFACE_NAME) == 0 ||
strcmp(name, ETH_OUTPUT_PORT) == 0 ||
strcmp(name, ETH_PRIORITY_MAPPINGS) == 0
strcmp(name, ETH_PRIORITY_MAPPINGS) == 0 ||
strcmp(name, LOW_LEVEL_TRANSPORT) == 0
))
{
EPROSIMA_LOG_ERROR(XMLPARSER, "Invalid element found into 'transportDescriptorType'. Name: " << name);
Expand Down
1 change: 1 addition & 0 deletions src/cpp/xmlparser/XMLParserCommon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ const char* HEALTHY_CHECK_TIMEOUT_MS = "healthy_check_timeout_ms";
const char* ETH_INTERFACE_NAME = "eth_interface_name";
const char* ETH_OUTPUT_PORT = "eth_output_port";
const char* ETH_PRIORITY_MAPPINGS = "eth_priority_mappings";
const char* LOW_LEVEL_TRANSPORT = "low_level_transport";
const char* DISCARD = "DISCARD";
const char* FAIL = "FAIL";
const char* RTPS_DUMP_FILE = "rtps_dump_file";
Expand Down
1 change: 1 addition & 0 deletions src/cpp/xmlparser/XMLParserCommon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ extern const char* HEALTHY_CHECK_TIMEOUT_MS;
extern const char* ETH_INTERFACE_NAME;
extern const char* ETH_OUTPUT_PORT;
extern const char* ETH_PRIORITY_MAPPINGS;
extern const char* LOW_LEVEL_TRANSPORT;
extern const char* DISCARD;
extern const char* FAIL;
extern const char* RTPS_DUMP_FILE;
Expand Down