Skip to content

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

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

Merged
merged 2 commits into from
Feb 5, 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).

@EugenioCollado EugenioCollado added this to the v3.0.2 milestone Jan 10, 2025
@Mario-DL Mario-DL requested review from Mario-DL and removed request for Mario-DL January 13, 2025 07:21
@github-actions github-actions bot added the ci-pending PR which CI is running label Jan 13, 2025
@Mario-DL Mario-DL requested review from Mario-DL and removed request for Mario-DL January 21, 2025 06:57
@Mario-DL Mario-DL added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. labels Jan 21, 2025
@Mario-DL
Copy link
Member

Giving another preemptive asan test rerun

@Javgilavi
Copy link
Contributor

@Mergifyio rebase

Copy link
Contributor Author

mergify bot commented Feb 3, 2025

rebase

✅ Branch has been successfully rebased

@Javgilavi Javgilavi force-pushed the mergify/bp/3.0.x/pr-5527 branch from 05c113b to 6424c12 Compare February 3, 2025 06:48
@Javgilavi Javgilavi self-requested a review February 3, 2025 06:48
@github-actions github-actions bot added the ci-pending PR which CI is running label Feb 3, 2025
@Javgilavi
Copy link
Contributor

@Mergifyio rebase

EugenioCollado and others added 2 commits February 4, 2025 14:45
* Regression tests for asio_helpers socket buffer size

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

* Regression tests udp & tcp

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

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

Signed-off-by: Miguel Company <[email protected]>

* Fix corner case infinite loop

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

* Uncrustify

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

* Fix UDP tests

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

* Fix windows compilation

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

* Applied suggestions to regression test

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

* Applied suggestions to udp tests

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

* Uncrustify

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

---------

Signed-off-by: Eugenio Collado <[email protected]>
Signed-off-by: Miguel Company <[email protected]>
Co-authored-by: Miguel Company <[email protected]>
(cherry picked from commit 5fc7786)
Signed-off-by: Mario Dominguez <[email protected]>
Copy link
Contributor Author

mergify bot commented Feb 4, 2025

rebase

✅ Branch has been successfully rebased

@Javgilavi Javgilavi force-pushed the mergify/bp/3.0.x/pr-5527 branch from 6424c12 to 9a5aba1 Compare February 4, 2025 14:45
@Javgilavi Javgilavi requested review from Javgilavi and removed request for Javgilavi February 4, 2025 14:48
Copy link
Contributor

@Javgilavi Javgilavi 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

@Javgilavi Javgilavi merged commit 68c7fee into 3.0.x Feb 5, 2025
17 checks passed
@Javgilavi Javgilavi deleted the mergify/bp/3.0.x/pr-5527 branch February 5, 2025 14:24
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.

3 participants