From 7c04632382ccb5bfa3567e4a33a10a077733ef26 Mon Sep 17 00:00:00 2001 From: elianalf <62831776+elianalf@users.noreply.github.com> Date: Tue, 28 May 2024 07:23:32 +0200 Subject: [PATCH 1/3] Refs #21106: Add missing missing documentation of netmask filter and max_msg_size_no_frag in TransportConfigQos Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> --- code/CodeTester.cpp | 1 - docs/03-exports/aliases-api.include | 2 ++ .../dds_layer/core/policy/eprosimaExtensions.rst | 10 ++++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/code/CodeTester.cpp b/code/CodeTester.cpp index 6c250bb0e..91adf58bd 100644 --- a/code/CodeTester.cpp +++ b/code/CodeTester.cpp @@ -16,7 +16,6 @@ using namespace eprosima::fastdds::dds; using namespace eprosima::fastrtps; using namespace ::rtps; -using namespace ::security; class HelloWorld { diff --git a/docs/03-exports/aliases-api.include b/docs/03-exports/aliases-api.include index 88854fb6e..de7b5b1c7 100644 --- a/docs/03-exports/aliases-api.include +++ b/docs/03-exports/aliases-api.include @@ -588,6 +588,8 @@ .. |TransportConfigQos::send_socket_buffer_size-api| replace:: :cpp:member:`send_socket_buffer_size` .. |TransportConfigQos::listen_socket_buffer_size-api| replace:: :cpp:member:`listen_socket_buffer_size` .. |TransportConfigQos::builtin_transports_reception_threads-api| replace:: :cpp:func:`builtin_transports_reception_threads()` +.. |TransportConfigQos::max_msg_size_no_frag-api| replace:: :cpp:member:`max_msg_size_no_frag` +.. |TransportConfigQos::netmask_filter-api| replace:: :cpp:member:`netmask_filter` .. |TransportDescriptorInterface-api| replace:: :cpp:struct:`TransportDescriptorInterface` .. |TransportDescriptorInterface::maxMessageSize-api| replace:: :cpp:member:`maxMessageSize` diff --git a/docs/fastdds/dds_layer/core/policy/eprosimaExtensions.rst b/docs/fastdds/dds_layer/core/policy/eprosimaExtensions.rst index cf9d9041c..f4cdaecd6 100644 --- a/docs/fastdds/dds_layer/core/policy/eprosimaExtensions.rst +++ b/docs/fastdds/dds_layer/core/policy/eprosimaExtensions.rst @@ -1005,6 +1005,12 @@ List of QoS Policy data members: * - |TransportConfigQos::builtin_transports_reception_threads-api| - |ThreadSettings| - + * - |TransportConfigQos::max_msg_size_no_frag-api| + - ``uint32_t`` + - 0 + * - |TransportConfigQos::netmask_filter-api| + - ``fastdds::rtps::NetmaskFilterKind`` + - ``AUTO`` * |TransportConfigQos::user_transports-api|: @@ -1020,6 +1026,10 @@ List of QoS Policy data members: be changed using this data member. * |TransportConfigQos::builtin_transports_reception_threads-api|: The |ThreadSettings| for the reception threads of the builtin transports. +* |TransportConfigQos::max_msg_size_no_frag-api|: + Maximum message size used to avoid fragmentation, set only in LARGE_DATA. +* |TransportConfigQos::netmask_filter-api|: + :ref:`Network filter` configuration. .. note:: This QoS Policy concerns to |DomainParticipant| entities. From 73f90eb301c75948ef2d417182ff219f71049c9e Mon Sep 17 00:00:00 2001 From: elianalf <62831776+elianalf@users.noreply.github.com> Date: Tue, 28 May 2024 08:21:17 +0200 Subject: [PATCH 2/3] Refs #21106: Apply suggestions Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> --- code/DDSCodeTester.cpp | 4 ++++ code/XMLTester.xml | 1 + docs/fastdds/dds_layer/core/policy/eprosimaExtensions.rst | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/code/DDSCodeTester.cpp b/code/DDSCodeTester.cpp index 0aa72f205..ba774c1f2 100644 --- a/code/DDSCodeTester.cpp +++ b/code/DDSCodeTester.cpp @@ -4359,6 +4359,10 @@ void dds_qos_examples() transport.use_builtin_transports = false; // [OPTIONAL] Set ThreadSettings for the builtin transports reception threads transport.builtin_transports_reception_threads_ = eprosima::fastdds::rtps::ThreadSettings{2, 2, 2, 2}; + // Set max_msg_size_no_frag to a value > 65500 KB + transport.max_msg_size_no_frag = 70000; + // Configure netmask filter + transport.netmask_filter = NetmaskFilterKind::ON; //!-- } diff --git a/code/XMLTester.xml b/code/XMLTester.xml index cc8c3b8c6..86dfb972b 100644 --- a/code/XMLTester.xml +++ b/code/XMLTester.xml @@ -281,6 +281,7 @@ my_transport false + ON <--> diff --git a/docs/fastdds/dds_layer/core/policy/eprosimaExtensions.rst b/docs/fastdds/dds_layer/core/policy/eprosimaExtensions.rst index f4cdaecd6..a2ffc41eb 100644 --- a/docs/fastdds/dds_layer/core/policy/eprosimaExtensions.rst +++ b/docs/fastdds/dds_layer/core/policy/eprosimaExtensions.rst @@ -1027,7 +1027,8 @@ List of QoS Policy data members: * |TransportConfigQos::builtin_transports_reception_threads-api|: The |ThreadSettings| for the reception threads of the builtin transports. * |TransportConfigQos::max_msg_size_no_frag-api|: - Maximum message size used to avoid fragmentation, set only in LARGE_DATA. + Maximum message size used to avoid fragmentation. + Useful when the configured transports allow for big datagrams to be sent (i.e. SHM or TCP). * |TransportConfigQos::netmask_filter-api|: :ref:`Network filter` configuration. From e6bbc0be6d8a69e687188f89fb1a76852c74f335 Mon Sep 17 00:00:00 2001 From: elianalf <62831776+elianalf@users.noreply.github.com> Date: Wed, 29 May 2024 09:02:53 +0200 Subject: [PATCH 3/3] Refs #21106: Add namespace Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> --- code/DDSCodeTester.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/DDSCodeTester.cpp b/code/DDSCodeTester.cpp index ba774c1f2..ba05d6fd3 100644 --- a/code/DDSCodeTester.cpp +++ b/code/DDSCodeTester.cpp @@ -4362,7 +4362,7 @@ void dds_qos_examples() // Set max_msg_size_no_frag to a value > 65500 KB transport.max_msg_size_no_frag = 70000; // Configure netmask filter - transport.netmask_filter = NetmaskFilterKind::ON; + transport.netmask_filter = eprosima::fastdds::rtps::NetmaskFilterKind::ON; //!-- }