New DDS example: Basic Configuration HelloWorld [12329]

examples/C++/DDS/BasicConfigurationExample/BasicConfigurationPublisher.cpp

@@ -82,12 +82,7 @@ bool HelloWorldPublisher::init(
     {
         pqos.transport().use_builtin_transports = false;
 
-        if (transport == SHM || transport == DATA_SHARING)
-        {
-            auto shm_transport = std::make_shared<SharedMemTransportDescriptor>();
-            pqos.transport().user_transports.push_back(shm_transport);
-        }
-        else if (transport == UDP)
+        if (transport == UDPv4)
         {
             auto udp_transport = std::make_shared<UDPv4TransportDescriptor>();
             pqos.transport().user_transports.push_back(udp_transport);
@@ -129,8 +124,8 @@ bool HelloWorldPublisher::init(
     // CREATE THE WRITER
     DataWriterQos wqos = DATAWRITER_QOS_DEFAULT;
 
-    // Data sharing set in endpoint. If it is not default or datasharing, set it to off
-    if (transport != DEFAULT && transport != DATA_SHARING)
+    // Data sharing set in endpoint. If it is not default, set it to off
+    if (transport != DEFAULT)
     {
         wqos.data_sharing().off();
     }

examples/C++/DDS/BasicConfigurationExample/BasicConfigurationSubscriber.cpp

@@ -76,12 +76,7 @@ bool HelloWorldSubscriber::init(
     {
         pqos.transport().use_builtin_transports = false;
 
-        if (transport == SHM || transport == DATA_SHARING)
-        {
-            auto shm_transport = std::make_shared<SharedMemTransportDescriptor>();
-            pqos.transport().user_transports.push_back(shm_transport);
-        }
-        else if (transport == UDP)
+        if (transport == UDPv4)
         {
             auto udp_transport = std::make_shared<UDPv4TransportDescriptor>();
             pqos.transport().user_transports.push_back(udp_transport);
@@ -130,8 +125,8 @@ bool HelloWorldSubscriber::init(
     }
     DataReaderQos rqos = DATAREADER_QOS_DEFAULT;
 
-    // Data sharing set in endpoint. If it is not default or datasharing, set it to off
-    if (transport != DEFAULT && transport != DATA_SHARING)
+    // Data sharing set in endpoint. If it is not default, set it to off
+    if (transport != DEFAULT)
     {
         rqos.data_sharing().off();
     }

examples/C++/DDS/BasicConfigurationExample/BasicConfiguration_main.cpp

@@ -160,17 +160,13 @@ int main(
                     break;
 
                 case optionIndex::TRANSPORT:
-                    if (strcmp(opt.arg, "dsh") == 0)
-                    {
-                        transport = DATA_SHARING;
-                    }
-                    else if (strcmp(opt.arg, "shm") == 0)
+                    if (strcmp(opt.arg, "shm") == 0)
                     {
                         transport = SHM;
                     }
-                    else if (strcmp(opt.arg, "udp") == 0)
+                    else if (strcmp(opt.arg, "udp") == 0 || (strcmp(opt.arg, "udpv4") == 0))
                     {
-                        transport = UDP;
+                        transport = UDPv4;
                     }
                     else if (strcmp(opt.arg, "udpv6") == 0)
                     {

examples/C++/DDS/BasicConfigurationExample/arg_configuration.h

@@ -106,11 +106,11 @@ struct Arg : public option::Arg
         if (option.arg != 0)
         {
             std::string transport = std::string(option.arg);
-            if (transport != "dsh" && transport != "shm" && transport != "udp" && transport != "udpv6")
+            if (transport != "shm" && transport != "udp" && transport != "udpv4" && transport != "udpv6")
             {
                 if (msg)
                 {
-                    print_error("Option '", option, "' only accepts <dsh|shm|ud|udpv6p> values\n");
+                    print_error("Option '", option, "' only accepts <shm|udp[v4]|udpv6> values\n");
                 }
                 return option::ARG_ILLEGAL;
             }
@@ -160,8 +160,8 @@ const option::Descriptor usage[] = {
     { ASYNC, 0, "a", "async",               Arg::None,
       "  -a \t--async \tAsynchronous publish mode (synchronous by default)." },
     { TRANSPORT, 0, "", "transport",        Arg::Transport,
-      "  \t--transport=<dsh|shm|udp|udpv6> \tUse only data-sharing, shared-memory, UDP, UDPv6 transport."
-      "If not set, use Fast DDS default transport (depending on the scenario it will use the most efficient one)." },
+      "  \t--transport=<shm|udp|udpv6> \tUse only data-sharing, shared-memory, UDPv4, UDPv6 transport."
+      "If not set, use Fast DDS default transports (depending on the scenario it will use the most efficient one)." },
 
     { UNKNOWN_OPT, 0, "", "",                Arg::None,      "\nSubscriber options:"},
     { TOPIC, 0, "t", "topic",                  Arg::String,
@@ -171,8 +171,8 @@ const option::Descriptor usage[] = {
     { SAMPLES, 0, "s", "samples",              Arg::Numeric,
       "  -s <num> \t--samples=<num>  \tNumber of samples to wait for (Default: 0 => infinite samples)." },
     { TRANSPORT, 0, "", "transport",        Arg::Transport,
-      "  \t--transport=<dsh|shm|udp|udpv6> \tUse only data-sharing, shared-memory, UDP, UDPv6 transport."
-      "If not set, use Fast DDS default transport (depending on the scenario it will use the most efficient one)." },
+      "  \t--transport=<shm|udp|udpv6> \tUse only data-sharing, shared-memory, UDPv4, UDPv6 transport."
+      "If not set, use Fast DDS default transports (depending on the scenario it will use the most efficient one)." },
 
     { UNKNOWN_OPT, 0, "", "",                Arg::None,      "\nQoS options:"},
     { RELIABLE, 0, "r", "reliable",         Arg::None,

examples/C++/DDS/BasicConfigurationExample/types.hpp

@@ -23,9 +23,8 @@
 enum TransportType
 {
     DEFAULT,
-    DATA_SHARING,
     SHM,
-    UDP,
+    UDPv4,
     UDPv6,
 };