Fix socket buffer size handling (#5921)

* [23459] Fix typo

Signed-off-by: Eugenio Collado <[email protected]>

* [23459] Remove buffer size upper limit

Signed-off-by: Eugenio Collado <[email protected]>

* [23459] Backport fix builtin socket buffer size parameter

Signed-off-by: Eugenio Collado <[email protected]>

* [23459] Fix test_UDPv4Transport

Signed-off-by: Eugenio Collado <[email protected]>

* [23459] Include removed comment

Signed-off-by: Eugenio Collado <[email protected]>

---------

Signed-off-by: Eugenio Collado <[email protected]>

Author: EugenioCollado

src/cpp/rtps/attributes/RTPSParticipantAttributes.cpp

@@ -317,8 +317,11 @@ void RTPSParticipantAttributes::setup_transports(
     }
     bool intraprocess_only = is_intraprocess_only(*this);
 
-    sendSocketBufferSize = options.sockets_buffer_size;
-    listenSocketBufferSize = options.sockets_buffer_size;
+    if (options.sockets_buffer_size != 0)
+    {
+        sendSocketBufferSize = options.sockets_buffer_size;
+        listenSocketBufferSize = options.sockets_buffer_size;
+    }
 
     switch (transports)
     {

src/cpp/rtps/transport/asio_helpers.hpp

@@ -87,10 +87,9 @@ struct asio_helpers
         if (!ec)
         {
             // Last attempt was successful. Get the actual value set.
-            int32_t max_value = static_cast<int32_t>(initial_buffer_value);
             BufferOptionType option;
             socket.get_option(option, ec);
-            if (!ec && (option.value() >= value_to_set) && (option.value() <= max_value))
+            if (!ec && (option.value() >= value_to_set))
             {
                 final_buffer_value = option.value();
                 return true;

src/cpp/rtps/transport/test_UDPv4Transport.cpp

@@ -65,8 +65,9 @@ test_UDPv4Transport::test_UDPv4Transport(
 {
     test_UDPv4Transport_DropLogLength = 0;
     test_UDPv4Transport_ShutdownAllNetwork = false;
-    UDPv4Transport::mSendBufferSize = descriptor.sendBufferSize;
-    UDPv4Transport::mReceiveBufferSize = descriptor.receiveBufferSize;
+    UDPv4Transport::configuration_.sendBufferSize = descriptor.sendBufferSize;
+    UDPv4Transport::configuration_.receiveBufferSize = descriptor.receiveBufferSize;
+    UDPv4Transport::configuration_.maxMessageSize = descriptor.maxMessageSize;
     for (auto interf : descriptor.interfaceWhiteList)
     {
         UDPv4Transport::interface_whitelist_.emplace_back(asio::ip::make_address_v4(interf));

test/blackbox/api/dds-pim/PubSubReader.hpp

@@ -1395,10 +1395,10 @@ class PubSubReader
     }
 
     PubSubReader& socket_buffer_size(
-            uint32_t sockerBufferSize)
+            uint32_t socketBufferSize)
     {
-        participant_qos_.transport().listen_socket_buffer_size = sockerBufferSize;
-        participant_qos_.transport().send_socket_buffer_size = sockerBufferSize;
+        participant_qos_.transport().listen_socket_buffer_size = socketBufferSize;
+        participant_qos_.transport().send_socket_buffer_size = socketBufferSize;
         return *this;
     }
 

test/blackbox/api/dds-pim/PubSubWriter.hpp

@@ -1547,10 +1547,10 @@ class PubSubWriter
     }
 
     PubSubWriter& socket_buffer_size(
-            uint32_t sockerBufferSize)
+            uint32_t socketBufferSize)
     {
-        participant_qos_.transport().listen_socket_buffer_size = sockerBufferSize;
-        participant_qos_.transport().send_socket_buffer_size = sockerBufferSize;
+        participant_qos_.transport().listen_socket_buffer_size = socketBufferSize;
+        participant_qos_.transport().send_socket_buffer_size = socketBufferSize;
         return *this;
     }
 

test/blackbox/api/fastrtps_deprecated/PubSubReader.hpp

@@ -1102,10 +1102,10 @@ class PubSubReader
     }
 
     PubSubReader& socket_buffer_size(
-            uint32_t sockerBufferSize)
+            uint32_t socketBufferSize)
     {
-        participant_attr_.rtps.listenSocketBufferSize = sockerBufferSize;
-        participant_attr_.rtps.sendSocketBufferSize = sockerBufferSize;
+        participant_attr_.rtps.listenSocketBufferSize = socketBufferSize;
+        participant_attr_.rtps.sendSocketBufferSize = socketBufferSize;
         return *this;
     }
 

test/blackbox/api/fastrtps_deprecated/PubSubWriter.hpp

@@ -1281,10 +1281,10 @@ class PubSubWriter
     }
 
     PubSubWriter& socket_buffer_size(
-            uint32_t sockerBufferSize)
+            uint32_t socketBufferSize)
     {
-        participant_attr_.rtps.listenSocketBufferSize = sockerBufferSize;
-        participant_attr_.rtps.sendSocketBufferSize = sockerBufferSize;
+        participant_attr_.rtps.listenSocketBufferSize = socketBufferSize;
+        participant_attr_.rtps.sendSocketBufferSize = socketBufferSize;
         return *this;
     }
 

test/blackbox/common/DDSBlackboxTestsListeners.cpp

@@ -776,6 +776,7 @@ void sample_lost_test_dr_init(
         PubSubReader<T>& reader,
         std::function<void(const eprosima::fastdds::dds::SampleLostStatus& status)> functor)
 {
+    reader.socket_buffer_size(SAMPLE_LOST_TEST_BUFFER_SIZE);
     reader.sample_lost_status_functor(functor)
             .init();
 
@@ -788,9 +789,6 @@ void sample_lost_test_init(
         PubSubWriter<T>& writer,
         std::function<void(const eprosima::fastdds::dds::SampleLostStatus& status)> functor)
 {
-    reader.socket_buffer_size(SAMPLE_LOST_TEST_BUFFER_SIZE);
-    writer.socket_buffer_size(SAMPLE_LOST_TEST_BUFFER_SIZE);
-
     sample_lost_test_dw_init(writer);
     sample_lost_test_dr_init(reader, functor);