Skip to content

[23459] Fix/socket buffer size handling #5926

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MiguelCompany merged 5 commits into from
Jul 14, 2025
Merged

[23459] Fix/socket buffer size handling #5926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
da302a7
[23459] test_UDPv4Transport set socket buffer size and max_msgs_size
EugenioCollado Jul 9, 2025
5b8ea40
[23459] Remove buffer size upper limit
EugenioCollado Jul 9, 2025
d678ecb
[23459] Remopve unnecesary lines
EugenioCollado Jul 10, 2025
f3b50b0
[23459] Add removed comment
EugenioCollado Jul 10, 2025
80e0d54
[23459] test_UDPv4 dr using builtin transport with modified buffer size
EugenioCollado Jul 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/cpp/rtps/transport/asio_helpers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 3 additions & 2 deletions src/cpp/rtps/transport/test_UDPv4Transport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
9 changes: 1 addition & 8 deletions test/blackbox/common/DDSBlackboxTestsListeners.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand All @@ -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);

Expand Down
Loading