Skip to content

Commit b623ffd

Browse files
authored
Add new XML tags (#6051)
* Refs #23645. Add new tags in XMLParser Signed-off-by: Ricardo González Moreno <[email protected]> * Refs #23645. Update XSD Signed-off-by: Ricardo González Moreno <[email protected]> --------- Signed-off-by: Ricardo González Moreno <[email protected]>
1 parent 0465569 commit b623ffd

File tree

4 files changed

+12
-2
lines changed

4 files changed

+12
-2
lines changed

resources/xsd/fastdds_profiles.xsd

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -948,7 +948,10 @@
948948
├ dump_thread [threadSettingsType] (ONLY available for SHM type)
949949
├ eth_interface_name [string] (ONLY available for ETH type)
950950
├ eth_output_port [uint16] (ONLY available for ETH type)
951-
└ eth_priority_mappings [ethernetPriorityMappingsType] (ONLY available for ETH type)
951+
├ eth_priority_mappings [ethernetPriorityMappingsType] (ONLY available for ETH type)
952+
└ low_level_transport [string] (ONLY available for PAYLOAD_COMPRESSION
953+
HEADER_REDUCTION
954+
SOURCE_TIMESTAMP types)
952955
-->
953956
<!-- TODO: How to ensure all elements are declared properly (UDP only, TCP only, etc...)? -->
954957
<xs:complexType name="transportDescriptorType">
@@ -963,6 +966,9 @@
963966
<xs:enumeration value="TCPv6"/>
964967
<xs:enumeration value="SHM"/>
965968
<xs:enumeration value="ETH"/>
969+
<xs:enumeration value="PAYLOAD_COMPRESSION"/>
970+
<xs:enumeration value="HEADER_REDUCTION"/>
971+
<xs:enumeration value="SOURCE_TIMESTAMP"/>
966972
</xs:restriction>
967973
</xs:simpleType>
968974
</xs:element>
@@ -1028,6 +1034,7 @@
10281034
<xs:element name="eth_interface_name" type="string" minOccurs="0" maxOccurs="1"/>
10291035
<xs:element name="eth_output_port" type="uint16" minOccurs="0" maxOccurs="1"/>
10301036
<xs:element name="eth_priority_mappings" type="ethernetPriorityMappingsType" minOccurs="0" maxOccurs="1"/>
1037+
<xs:element name="low_level_transport" type="string" minOccurs="0" maxOccurs="1"/>
10311038
</xs:all>
10321039
</xs:complexType>
10331040

src/cpp/xmlparser/XMLParser.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,8 @@ XMLP_ret XMLParser::validateXMLTransportElements(
467467
strcmp(name, SEGMENT_OVERFLOW_POLICY) == 0 ||
468468
strcmp(name, ETH_INTERFACE_NAME) == 0 ||
469469
strcmp(name, ETH_OUTPUT_PORT) == 0 ||
470-
strcmp(name, ETH_PRIORITY_MAPPINGS) == 0
470+
strcmp(name, ETH_PRIORITY_MAPPINGS) == 0 ||
471+
strcmp(name, LOW_LEVEL_TRANSPORT) == 0
471472
))
472473
{
473474
EPROSIMA_LOG_ERROR(XMLPARSER, "Invalid element found into 'transportDescriptorType'. Name: " << name);

src/cpp/xmlparser/XMLParserCommon.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ const char* HEALTHY_CHECK_TIMEOUT_MS = "healthy_check_timeout_ms";
7777
const char* ETH_INTERFACE_NAME = "eth_interface_name";
7878
const char* ETH_OUTPUT_PORT = "eth_output_port";
7979
const char* ETH_PRIORITY_MAPPINGS = "eth_priority_mappings";
80+
const char* LOW_LEVEL_TRANSPORT = "low_level_transport";
8081
const char* DISCARD = "DISCARD";
8182
const char* FAIL = "FAIL";
8283
const char* RTPS_DUMP_FILE = "rtps_dump_file";

src/cpp/xmlparser/XMLParserCommon.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ extern const char* HEALTHY_CHECK_TIMEOUT_MS;
9090
extern const char* ETH_INTERFACE_NAME;
9191
extern const char* ETH_OUTPUT_PORT;
9292
extern const char* ETH_PRIORITY_MAPPINGS;
93+
extern const char* LOW_LEVEL_TRANSPORT;
9394
extern const char* DISCARD;
9495
extern const char* FAIL;
9596
extern const char* RTPS_DUMP_FILE;

0 commit comments

Comments
 (0)