From 51c30b7b0128ff41a2fc3d992bab2f6b515a2605 Mon Sep 17 00:00:00 2001
From: Erin McManus <erin@rti.com>
Date: Mon, 10 Jun 2024 13:40:11 -0600
Subject: [PATCH] CORE-11925 updated wan settings based on new message_size_max
 and asynchronous publishing settings

---
 .../c++98/CLOUD_DISCOVERY_SERVICE.xml         | 16 --------
 .../c++98/USER_QOS_PROFILES.xml               | 40 ++++---------------
 2 files changed, 8 insertions(+), 48 deletions(-)

diff --git a/examples/connext_dds/real_time_wan_transport/c++98/CLOUD_DISCOVERY_SERVICE.xml b/examples/connext_dds/real_time_wan_transport/c++98/CLOUD_DISCOVERY_SERVICE.xml
index 4cc6e5b03..b75068980 100644
--- a/examples/connext_dds/real_time_wan_transport/c++98/CLOUD_DISCOVERY_SERVICE.xml
+++ b/examples/connext_dds/real_time_wan_transport/c++98/CLOUD_DISCOVERY_SERVICE.xml
@@ -11,14 +11,6 @@
                         <name>dds.transport.UDPv4_WAN.builtin.public_address</name>
                         <value>$(PUBLIC_ADDRESS)</value>
                     </element>
-                    <element>
-                        <name>dds.transport.UDPv4_WAN.builtin.parent.message_size_max</name>
-                        <value>1400</value>
-                    </element>
-                    <element>
-                        <name>dds.participant.protocol.rtps_overhead</name>
-                        <value>256</value>
-                    </element>
                 </property>
             </element>
         </transport>
@@ -43,14 +35,6 @@
                         <name>dds.transport.UDPv4_WAN.builtin.public_address</name>
                         <value>$(PUBLIC_ADDRESS)</value>
                     </element>
-                    <element>
-                        <name>dds.transport.UDPv4_WAN.builtin.parent.message_size_max</name>
-                        <value>1400</value>
-                    </element>
-                    <element>
-                        <name>dds.participant.protocol.rtps_overhead</name>
-                        <value>256</value>
-                    </element>
                 </property>
             </element>
         </transport>
diff --git a/examples/connext_dds/real_time_wan_transport/c++98/USER_QOS_PROFILES.xml b/examples/connext_dds/real_time_wan_transport/c++98/USER_QOS_PROFILES.xml
index fa6f0539b..a77d622b8 100644
--- a/examples/connext_dds/real_time_wan_transport/c++98/USER_QOS_PROFILES.xml
+++ b/examples/connext_dds/real_time_wan_transport/c++98/USER_QOS_PROFILES.xml
@@ -19,9 +19,15 @@
             <binding_ping_period>3000</binding_ping_period>
             <!-- 
               For WAN communications, it is not a good idea to rely on 
-              IP fragmentation. This setting Disables IP fragmentation 
-            -->
+              IP fragmentation. When the message_size_max is set to a value 
+              smaller than the smallest IP MTU in your network path, IP 
+              fragmentation is disabled. The Real-Time WAN Transport already 
+              sets the default value to 1400 bytes, which is sufficiently small 
+              in most cases. If your network path has a smaller MTU, you can 
+              set the message_size_max to a smaller value here.
+            
             <message_size_max>1400</message_size_max>
+            -->
           </udpv4_wan>
         </transport_builtin>
         <discovery_config>
@@ -29,37 +35,7 @@
             <sec>5</sec>
             <nanosec>0</nanosec>
           </participant_liveliness_assert_period>
-          <!-- Required when IP fragmentation is disabled -->
-          <publication_writer_publish_mode>
-            <kind>ASYNCHRONOUS_PUBLISH_MODE_QOS</kind>
-          </publication_writer_publish_mode>
-          <subscription_writer_publish_mode>
-              <kind>ASYNCHRONOUS_PUBLISH_MODE_QOS</kind>
-          </subscription_writer_publish_mode>
-          <secure_volatile_writer_publish_mode>
-              <kind>ASYNCHRONOUS_PUBLISH_MODE_QOS</kind>
-          </secure_volatile_writer_publish_mode>
-          <service_request_writer_publish_mode>
-              <kind>ASYNCHRONOUS_PUBLISH_MODE_QOS</kind>
-          </service_request_writer_publish_mode>
         </discovery_config>
-        <property>
-          <value>
-            <element>
-              <!--
-                Connext DDS adds protocol information to every RTPS message 
-                it sends out. If DDS-level fragmentation is used, the amount 
-                of overhead reserved per RTPS message for this protocol 
-                information may become relatively large. This property, 
-                with a default value of 512, is used to adjust the overhead 
-                of the RTPS protocol without including security so that
-                the user payload utilization ratio is larger.
-              -->
-              <name>dds.participant.protocol.rtps_overhead</name>
-              <value>256</value>
-            </element>
-          </value>
-        </property>
       </participant_qos>
     </qos_profile>