Fix socket buffer size handling (#5926)

* [23459] test_UDPv4Transport set socket buffer size and max_msgs_size

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

* [23459] Remove buffer size upper limit

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

* [23459] Remopve unnecesary lines

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

* [23459] Add removed comment

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

* [23459] test_UDPv4 dr using builtin transport with modified buffer size

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

---------

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

Author: EugenioCollado

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

@@ -59,8 +59,9 @@ test_UDPv4Transport::test_UDPv4Transport(
 
     test_transport_options->test_UDPv4Transport_DropLogLength = 0;
     test_transport_options->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/common/DDSBlackboxTestsListeners.cpp

@@ -796,12 +796,8 @@ void sample_lost_test_dr_init(
         PubSubReader<T>& reader,
         std::function<void(const eprosima::fastdds::dds::SampleLostStatus& status)> functor)
 {
-    auto udp_transport = std::make_shared<UDPv4TransportDescriptor>();
-    udp_transport->sendBufferSize = SAMPLE_LOST_TEST_BUFFER_SIZE;
-    udp_transport->receiveBufferSize = SAMPLE_LOST_TEST_BUFFER_SIZE;
 
-    reader.disable_builtin_transport()
-            .add_user_transport_to_pparams(udp_transport)
+    reader.socket_buffer_size(SAMPLE_LOST_TEST_BUFFER_SIZE)
             .sample_lost_status_functor(functor)
             .init();
 
@@ -814,9 +810,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);