Skip to content
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.

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

[22210] Handle socket buffer size setting when system's maximum exceeded (backport #5527) #5560

Merged
merged 2 commits into from
Jan 31, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 10, 2025

Description

This PR fixes the socket buffer size configuration mechanism. Previously, the try_setting_buffer_size method relied on the error code returned by the ASIO API to verify successful changes, which proved unreliable as no error code was returned even when the operation failed. The method has been updated to validate the buffer size by checking the actual size after setting the option, ensuring correct configuration or at least returning the actual final_buffer_value.

@Mergifyio backport 3.1.x 3.0.x 2.14.x 2.10.x 2.6.x

Contributor Checklist

  • Commit messages follow the project guidelines.

  • The code follows the style guidelines of this project.

  • Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally

  • NA: Any new/modified methods have been properly documented using Doxygen.

  • NA: Any new configuration API has an equivalent XML API (with the corresponding XSD extension)

  • Changes are backport compatible: they do NOT break ABI nor change library core behavior.

  • Changes are API compatible.

  • NA: New feature has been added to the versions.md file (if applicable).

  • NA: New feature has been documented/Current behavior is correctly described in the documentation.

  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • If this is a critical bug fix, backports to the critical-only supported branches have been requested.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

This is an automatic backport of pull request #5527 done by [Mergify](https://mergify.com).

@MiguelCompany MiguelCompany added this to the v3.1.2 milestone Jan 10, 2025
@MiguelCompany MiguelCompany self-requested a review January 10, 2025 11:07
@github-actions github-actions bot added the ci-pending PR which CI is running label Jan 10, 2025
@MiguelCompany
Copy link
Member

@Mergifyio rebase

* Regression tests for asio_helpers socket buffer size

Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>

* Regression tests udp & tcp

Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>

* Refs #22210. Ensure that actual set value is returned by `asio_helpers::try_setting_buffer_size`

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Fix corner case infinite loop

Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>

* Uncrustify

Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>

* Fix UDP tests

Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>

* Fix windows compilation

Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>

* Applied suggestions to regression test

Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>

* Applied suggestions to udp tests

Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>

* Uncrustify

Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>

---------

Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 5fc7786)
Copy link
Contributor Author

mergify bot commented Jan 17, 2025

rebase

✅ Branch has been successfully rebased

@MiguelCompany MiguelCompany force-pushed the mergify/bp/3.1.x/pr-5527 branch from d1c0c58 to 293ee43 Compare January 17, 2025 11:47
@MiguelCompany MiguelCompany requested review from MiguelCompany and removed request for MiguelCompany January 17, 2025 11:47
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
@MiguelCompany MiguelCompany requested review from MiguelCompany and removed request for MiguelCompany January 29, 2025 11:50
Copy link
Member

@MiguelCompany MiguelCompany left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with green CI

@MiguelCompany MiguelCompany merged commit 7d13f82 into 3.1.x Jan 31, 2025
17 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/3.1.x/pr-5527 branch January 31, 2025 12:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci-pending PR which CI is running
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants