From f91e754f69efb3abf3058679e768b6596a22d30d Mon Sep 17 00:00:00 2001
From: Luis Gasco <luisgasco@eprosima.com>
Date: Tue, 14 May 2019 11:37:17 +0200
Subject: [PATCH] Fixed whitelist and bug with xml structure literal include
 (#34)

* Refs #5388 Fixed whitelist and bug with xml structure literal include.

* Refs #5389 Requested changes

* Update code/XMLTester.xml

Co-Authored-By: MiguelCompany <miguelcompany@eprosima.com>

* Refs #5389 Requested changes
---
 code/XMLTester.xml   | 44 ++++++++++++++++++++++----------------------
 docs/xmlprofiles.rst |  2 +-
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/code/XMLTester.xml b/code/XMLTester.xml
index 47544dbc7..b45aff9b9 100644
--- a/code/XMLTester.xml
+++ b/code/XMLTester.xml
@@ -117,7 +117,7 @@
     <qos>
         <lifespan>
             <duration>
-	        <sec>1</sec>
+                <sec>1</sec>
             </duration>
         </lifespan>
     </qos>
@@ -127,7 +127,7 @@
     <qos>
         <lifespan>
             <duration>
-	        <sec>1</sec>
+                <sec>1</sec>
             </duration>
         </lifespan>
     </qos>
@@ -138,9 +138,9 @@
 <publisher profile_name="publisher_xml_conf_disable_positive_acks_profile">
     <qos>
         <disablePositiveAcks>
-	    <enabled>true</enabled>
+            <enabled>true</enabled>
             <duration>
-	        <sec>1</sec>
+                <sec>1</sec>
             </duration>
         </disablePositiveAcks>
     </qos>
@@ -149,7 +149,7 @@
 <subscriber profile_name="subscriber_xml_conf_disable_positive_acks_profile">
     <qos>
         <disablePositiveAcks>
-	    <enabled>true</enabled>
+            <enabled>true</enabled>
         </disablePositiveAcks>
     </qos>
 </subscriber>
@@ -160,8 +160,8 @@
     <qos>
         <deadline>
             <period>
-	        <sec>1</sec>
-	    </period>
+                <sec>1</sec>
+            </period>
         </deadline>
     </qos>
 </publisher>
@@ -170,8 +170,8 @@
     <qos>
         <deadline>
             <period>
-	        <sec>1</sec>
-	    </period>
+                <sec>1</sec>
+            </period>
         </deadline>
     </qos>
 </subscriber>
@@ -579,8 +579,8 @@
         <maxMessageSize>16384</maxMessageSize> <!-- uint32 -->
         <maxInitialPeersRange>100</maxInitialPeersRange> <!-- uint32 -->
         <interfaceWhiteList>
-            <id>192.168.1.41</id> <!-- string -->
-            <id>127.0.0.1</id> <!-- string -->
+            <address>192.168.1.41</address> <!-- string -->
+            <address>127.0.0.1</address> <!-- string -->
         </interfaceWhiteList>
         <wan_addr>80.80.55.44</wan_addr> <!-- string -->
         <output_port>5101</output_port> <!-- uint16 -->
@@ -712,7 +712,7 @@
     <case>
         <caseDiscriminator value="0"/>
         <caseDiscriminator value="1"/>
-         <member name="first" type="int32"/>
+        <member name="first" type="int32"/>
     </case>
     <case>
         <caseDiscriminator value="2"/>
@@ -856,8 +856,8 @@
     </rtps>
 </participant>
 <!--><-->
-	<!-- Not Used at the moment -->
-	<!-- <userData>148875 </userData> -->
+    <!-- Not Used at the moment -->
+    <!-- <userData>148875 </userData> -->
 
 <participant profile_name="part_builtin_example">
 <rtps>
@@ -1217,8 +1217,8 @@
             <maxMessageSize>16384</maxMessageSize>
             <maxInitialPeersRange>100</maxInitialPeersRange>
             <interfaceWhiteList>
-                <id>192.168.1.41</id>
-                <id>127.0.0.1</id>
+                <address>192.168.1.41</address>
+                <address>127.0.0.1</address>
             </interfaceWhiteList>
             <wan_addr>80.80.55.44</wan_addr>
             <keep_alive_frequency_ms>5000</keep_alive_frequency_ms>
@@ -1569,12 +1569,12 @@
             <publishMode>
                 <kind>ASYNCHRONOUS</kind>
             </publishMode>
-	    <disablePositiveAcks>
-	        <enabled>true</enabled>
-	        <duration>
-		    <sec>1</sec>
-		</duration>
-	    </disablePositiveAcks>
+            <disablePositiveAcks>
+                <enabled>true</enabled>
+                    <duration>
+                    <sec>1</sec>
+                </duration>
+            </disablePositiveAcks>
         </qos>
 
         <times>
diff --git a/docs/xmlprofiles.rst b/docs/xmlprofiles.rst
index ea80df93f..8f64e9066 100644
--- a/docs/xmlprofiles.rst
+++ b/docs/xmlprofiles.rst
@@ -28,7 +28,7 @@ An XML file can contain several XML profiles. The available profile types are :r
 .. literalinclude:: ../code/XMLTester.xml
     :language: xml
     :start-after: <!-->PROFILES-TRANSPORT-DESCRIPTORS<-->
-    :lines: 1-6, 11-32
+    :lines: 1-6, 43-63
 
 The Fast-RTPS XML format uses some structures along several profiles types.
 For readability, the :ref:`commonxml` section groups these common structures.