Refs #22427: New DS_AUTO BuiltinTransport option

Signed-off-by: Mario Dominguez <[email protected]>
eProsima · Dec 5, 2024 · bba066a · bba066a
1 parent de2890a
commit bba066a
Show file tree

Hide file tree

Showing 10 changed files with 57 additions and 5 deletions.
diff --git a/include/fastdds/rtps/attributes/BuiltinTransports.hpp b/include/fastdds/rtps/attributes/BuiltinTransports.hpp
@@ -104,14 +104,15 @@ inline bool operator ==(
  */
 enum class BuiltinTransports : uint16_t
 {
-    NONE = 0,      //< No transport will be instantiated
-    DEFAULT = 1,   //< Default value that will instantiate UDPv4 and SHM transports
+    NONE = 0,          //< No transport will be instantiated
+    DEFAULT = 1,       //< Default value that will instantiate UDPv4 and SHM transports
     DEFAULTv6 = 2,     //< Instantiate UDPv6 and SHM transports
     SHM = 3,           //< Instantiate SHM transport only
     UDPv4 = 4,         //< Instantiate UDPv4 transport only
     UDPv6 = 5,         //< Instantiate UDPv6 transport only
     LARGE_DATA = 6,    //< Instantiate SHM, UDPv4 and TCPv4 transports, but UDPv4 is only used for bootstrapping discovery
-    LARGE_DATAv6 = 7   //< Instantiate SHM, UDPv6 and TCPv6 transports, but UDPv6 is only used for bootstrapping discovery
+    LARGE_DATAv6 = 7,  //< Instantiate SHM, UDPv6 and TCPv6 transports, but UDPv6 is only used for bootstrapping discovery
+    DS_AUTO = 8        //< Instantiate SHM and TCPv4 transports
 };
 
 inline std::ostream& operator <<(
@@ -144,6 +145,9 @@ inline std::ostream& operator <<(
         case BuiltinTransports::LARGE_DATAv6:
             output << "LARGE_DATAv6";
             break;
+        case BuiltinTransports::DS_AUTO:
+            output << "DS_AUTO";
+            break;
         default:
             output << "UNKNOWN";
             break;

diff --git a/resources/xsd/fastdds_profiles.xsd b/resources/xsd/fastdds_profiles.xsd
@@ -1963,6 +1963,7 @@
             <xs:enumeration value="UDPv6" />
             <xs:enumeration value="LARGE_DATA" />
             <xs:enumeration value="LARGE_DATAv6" />
+            <xs:enumeration value="DS_AUTO" />
         </xs:restriction>
     </xs:simpleType>
 

diff --git a/src/cpp/rtps/attributes/RTPSParticipantAttributes.cpp b/src/cpp/rtps/attributes/RTPSParticipantAttributes.cpp
@@ -301,6 +301,28 @@ static void setup_transports_large_datav6(
     }
 }
 
+static void setup_transports_ds_auto(
+        RTPSParticipantAttributes& att,
+        bool intraprocess_only,
+        const fastdds::rtps::BuiltinTransportsOptions& options)
+{
+    if (!intraprocess_only)
+    {
+        setup_large_data_shm_transport(att, options);
+
+        auto tcp_transport = create_tcpv4_transport(att, options);
+        att.userTransports.push_back(tcp_transport);
+
+        Locator_t tcp_loc;
+        tcp_loc.kind = LOCATOR_KIND_TCPv4;
+        IPLocator::setIPv4(tcp_loc, "0.0.0.0");
+        IPLocator::setPhysicalPort(tcp_loc, 0);
+        IPLocator::setLogicalPort(tcp_loc, 0);
+        att.builtin.metatrafficUnicastLocatorList.push_back(tcp_loc);
+        att.defaultUnicastLocatorList.push_back(tcp_loc);
+    }
+}
+
 void RTPSParticipantAttributes::setup_transports(
         fastdds::rtps::BuiltinTransports transports,
         const fastdds::rtps::BuiltinTransportsOptions& options)
@@ -358,6 +380,12 @@ void RTPSParticipantAttributes::setup_transports(
             setup_transports_large_datav6(*this, intraprocess_only, options);
             break;
 
+        case fastdds::rtps::BuiltinTransports::DS_AUTO:
+            // This parameter will allow allow the initialization of UDP transports with maxMessageSize > 65500 KB (s_maximumMessageSize)
+            max_msg_size_no_frag = options.maxMessageSize;
+            setup_transports_ds_auto(*this, intraprocess_only, options);
+            break;
+
         default:
             EPROSIMA_LOG_ERROR(RTPS_PARTICIPANT,
                     "Setup for '" << transports << "' transport configuration not yet supported.");

diff --git a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp
@@ -114,7 +114,8 @@ static void set_builtin_transports_from_env_var(
                     "UDPv4", BuiltinTransports::UDPv4,
                     "UDPv6", BuiltinTransports::UDPv6,
                     "LARGE_DATA", BuiltinTransports::LARGE_DATA,
-                    "LARGE_DATAv6", BuiltinTransports::LARGE_DATAv6))
+                    "LARGE_DATAv6", BuiltinTransports::LARGE_DATAv6,
+                    "DS_AUTO", BuiltinTransports::DS_AUTO))
             {
                 EPROSIMA_LOG_ERROR(RTPS_PARTICIPANT, "Wrong value '" << env_value << "' for environment variable '" <<
                         env_var_name << "'. Leaving as DEFAULT");
@@ -140,7 +141,8 @@ static void set_builtin_transports_from_env_var(
                         "UDPv4", BuiltinTransports::UDPv4,
                         "UDPv6", BuiltinTransports::UDPv6,
                         "LARGE_DATA", BuiltinTransports::LARGE_DATA,
-                        "LARGE_DATAv6", BuiltinTransports::LARGE_DATAv6))
+                        "LARGE_DATAv6", BuiltinTransports::LARGE_DATAv6,
+                        "DS_AUTO", BuiltinTransports::DS_AUTO))
                 {
                     EPROSIMA_LOG_ERROR(RTPS_PARTICIPANT, "Wrong value '" << env_value << "' for environment variable '" <<
                             env_var_name << "'. Leaving as DEFAULT");

diff --git a/src/cpp/xmlparser/XMLElementParser.cpp b/src/cpp/xmlparser/XMLElementParser.cpp
@@ -4687,6 +4687,7 @@ XMLP_ret XMLParser::getXMLBuiltinTransports(
                 <xs:enumeration value="UDPv6" />
                 <xs:enumeration value="LARGE_DATA" />
                 <xs:enumeration value="LARGE_DATAv6" />
+                <xs:enumeration value="DS_AUTO" />
             </xs:restriction>
         </xs:simpleType>
 

diff --git a/src/cpp/xmlparser/XMLParserCommon.cpp b/src/cpp/xmlparser/XMLParserCommon.cpp
@@ -199,6 +199,7 @@ const char* DEFAULT_C = "DEFAULT";
 const char* DEFAULTv6 = "DEFAULTv6";
 const char* LARGE_DATA = "LARGE_DATA";
 const char* LARGE_DATAv6 = "LARGE_DATAv6";
+const char* DS_AUTO = "DS_AUTO";
 const char* INIT_ACKNACK_DELAY = "initial_acknack_delay";
 const char* HEARTB_RESP_DELAY = "heartbeat_response_delay";
 const char* INIT_HEARTB_DELAY = "initial_heartbeat_delay";

diff --git a/src/cpp/xmlparser/XMLParserCommon.h b/src/cpp/xmlparser/XMLParserCommon.h
@@ -215,6 +215,7 @@ extern const char* DEFAULT_C;
 extern const char* DEFAULTv6;
 extern const char* LARGE_DATA;
 extern const char* LARGE_DATAv6;
+extern const char* DS_AUTO;
 extern const char* INIT_ACKNACK_DELAY;
 extern const char* HEARTB_RESP_DELAY;
 extern const char* INIT_HEARTB_DELAY;

diff --git a/test/blackbox/builtin_transports_profile.xml b/test/blackbox/builtin_transports_profile.xml
@@ -111,5 +111,13 @@
             </rtps>
         </participant>
 
+        <participant profile_name="participant_ds_auto">
+            <domainId>0</domainId>
+            <rtps>
+                <name>Participant.builtin_transports_ds_auto</name>
+                <builtinTransports>DS_AUTO</builtinTransports>
+            </rtps>
+        </participant>
+
     </profiles>
 </dds>
diff --git a/test/blackbox/common/BlackboxTestsTransportCustom.cpp b/test/blackbox/common/BlackboxTestsTransportCustom.cpp
@@ -675,6 +675,11 @@ TEST(ChainingTransportTests, builtin_transports_xml_large_data)
     BuiltinTransportsTest::test_xml("builtin_transports_profile.xml", "participant_largedata");
 }
 
+TEST(ChainingTransportTests, builtin_transports_xml_ds_auto)
+{
+    BuiltinTransportsTest::test_xml("builtin_transports_profile.xml", "participant_ds_auto");
+}
+
 TEST(ChainingTransportTests, builtin_transports_xml_large_data_with_max_msg_size)
 {
     BuiltinTransportsTest::test_xml("builtin_transports_profile.xml", "participant_largedata_max_msg_size");

diff --git a/test/unittest/xmlparser/XMLElementParserTests.cpp b/test/unittest/xmlparser/XMLElementParserTests.cpp
@@ -646,6 +646,7 @@ TEST_F(XMLParserTests, getXMLbuiltinTransports)
     bt_list.push_back("UDPv6");
     bt_list.push_back("LARGE_DATA");
     bt_list.push_back("LARGE_DATAv6");
+    bt_list.push_back("DS_AUTO");
 
     for (auto test_transport : bt_list)
     {