Skip to content

Commit 4fce961

Browse files
cferreiragonzcferreiragonz
committed
Refs #20629: Update XML tags
Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
1 parent 4e2d630 commit 4fce961

2 files changed

Lines changed: 34 additions & 100 deletions

File tree

‎code/XMLTesterExample.xml‎

Lines changed: 24 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -228,42 +228,30 @@
228228
<discovery_config>
229229
<discoveryProtocol>NONE</discoveryProtocol>
230230
<discoveryServersList>
231-
<RemoteServer prefix="72.61.73.70.66.61.72.6d.74.65.73.74">
232-
<metatrafficUnicastLocatorList>
233-
<locator>
234-
<udpv4>
235-
<address>192.168.10.57</address>
236-
<port>56542</port>
237-
</udpv4>
238-
</locator>
239-
</metatrafficUnicastLocatorList>
240-
<metatrafficMulticastLocatorList>
241-
<locator>
242-
<udpv4>
243-
<address>192.168.10.58</address>
244-
<port>24565</port>
245-
</udpv4>
246-
</locator>
247-
</metatrafficMulticastLocatorList>
248-
</RemoteServer>
249-
<RemoteServer prefix="72.61.73.70.66.61.72.6d.74.65.73.75">
250-
<metatrafficUnicastLocatorList>
251-
<locator>
252-
<udpv4>
253-
<address>192.168.10.59</address>
254-
<port>56543</port>
255-
</udpv4>
256-
</locator>
257-
</metatrafficUnicastLocatorList>
258-
<metatrafficMulticastLocatorList>
259-
<locator>
260-
<udpv4>
261-
<address>192.168.10.60</address>
262-
<port>34565</port>
263-
</udpv4>
264-
</locator>
265-
</metatrafficMulticastLocatorList>
266-
</RemoteServer>
231+
<locator>
232+
<udpv4>
233+
<address>192.168.10.57</address>
234+
<port>56542</port>
235+
</udpv4>
236+
</locator>
237+
<locator>
238+
<udpv4>
239+
<address>192.168.10.58</address>
240+
<port>24565</port>
241+
</udpv4>
242+
</locator>
243+
<locator>
244+
<udpv4>
245+
<address>192.168.10.59</address>
246+
<port>56543</port>
247+
</udpv4>
248+
</locator>
249+
<locator>
250+
<udpv4>
251+
<address>192.168.10.60</address>
252+
<port>34565</port>
253+
</udpv4>
254+
</locator>
267255
</discoveryServersList>
268256
<ignoreParticipantFlags>FILTER_DIFFERENT_PROCESS|FILTER_SAME_PROCESS</ignoreParticipantFlags>
269257
<EDP>SIMPLE</EDP>

‎docs/fastdds/xml_configuration/domainparticipant.rst‎

Lines changed: 10 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -351,19 +351,22 @@ configurable settings.
351351
+=================================+================================================+=====================+=============+
352352
| ``<discoveryProtocol>`` | Indicates which discovery protocol |br| | |SIMPLE| | |SIMPLE| |
353353
| | the DomainParticipant will use. |br| +---------------------+ |
354-
| | See :ref:`disc_mechanisms`. If set to |br| | |CLIENT| | |
355-
| | |CLIENT|, ``<discoveryServersList>`` |br| +---------------------+ |
354+
| | See :ref:`disc_mechanisms`. If not set to |br| | |CLIENT| | |
355+
| | |SIMPLE| or |NONE|, +---------------------+ |
356+
| | ``<discoveryServersList>`` |br| | | |
356357
| | element would be used. | |SERVER| | |
357358
| | +---------------------+ |
358359
| | | |BACKUP| | |
359360
| | +---------------------+ |
361+
| | | |SUPER_CLIENT| | |
362+
| | +---------------------+ |
360363
| | | |NONE| | |
361364
+---------------------------------+------------------------------------------------+---------------------+-------------+
362-
| ``<discoveryServersList>`` | Describes servers from which it receives |br| | :ref:`discserverlst`| |
363-
| | only the discovery information they |br| | | |
364-
| | require to establish communication with |br| | | |
365-
| | matching endpoints. |br| | | |
366-
| | See :ref:`discovery_server` | | |
365+
| ``<discoveryServersList>`` | Describes locators of servers from which |br| | ``<locator>`` | |
366+
| | it receives only the discovery information |br|| | |
367+
| | they require to establish communication |br| | | |
368+
| | with matching endpoints. |br| | | |
369+
| | It expects a :ref:`LocatorListType`. | | |
367370
+---------------------------------+------------------------------------------------+---------------------+-------------+
368371
| ``<ignoreParticipantFlags>`` | Restricts metatraffic using several |br| | :ref:`partfiltering`| |NO_FILTER| |
369372
| | filtering criteria. | | |
@@ -406,63 +409,6 @@ configurable settings.
406409
| | ``STATIC``. See :ref:`discovery_static`. | | |
407410
+---------------------------------+------------------------------------------------+---------------------+-------------+
408411

409-
410-
.. _discserverlst:
411-
412-
discoveryServersList
413-
####################
414-
415-
Contains a list of ``<RemoteServer>`` (*server*) elements, which are defined by the |GuidPrefix_t-api| and their own
416-
locator list which must be populated with |RemoteServerAttributes-api|.
417-
The DomainParticipant set as *client* would discover the *servers* described in this section.
418-
419-
420-
**Server attributes**
421-
422-
The ``<RemoteServer>`` element has a mandatory attribute defined: ``prefix``.
423-
424-
.. list-table::
425-
:header-rows: 1
426-
:align: left
427-
428-
* - Name
429-
- Description
430-
- Use
431-
* - ``prefix``
432-
- RTPS standard participant unique identifier, a 12-byte chain. |br|
433-
This identifier allows clients to assess whether they are |br|
434-
receiving messages from the right server.
435-
- Mandatory
436-
437-
**RemoteServer configuration**
438-
439-
Each *client* (or a *server* connecting to another *server*) must keep a list of locators associated to the *servers*
440-
to which it wants to link.
441-
Those locator would be defined as ``metatrafficUnicastLocatorList`` or ``metatrafficMulticastLocatorList``.
442-
443-
.. list-table::
444-
:header-rows: 1
445-
:align: left
446-
447-
* - Name
448-
- Description
449-
- Values
450-
* - ``<metatrafficUnicastLocatorList>``
451-
- Metatraffic Unicast Locator List.
452-
- A set of ``<locator>`` members. |br| See :ref:`LocatorListType`
453-
* - ``<metatrafficMulticastLocatorList>``
454-
- Metatraffic Multicast Locator List.
455-
- A set of ``<locator>`` members. |br| See :ref:`LocatorListType`
456-
457-
**Example**
458-
459-
.. literalinclude:: /../code/XMLTester.xml
460-
:language: xml
461-
:start-after: <!-->CONF_DS_MAIN_SCENARIO_CLIENT<-->
462-
:end-before: <!--><-->
463-
:lines: 2-3,5-
464-
:append: </profiles>
465-
466412
.. _partfiltering:
467413

468414
ignoreParticipantFlags

0 commit comments

Comments
 (0)