-
Notifications
You must be signed in to change notification settings - Fork 790
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
[21036] Handle errors when setting socket buffer sizes (backport #4760) (backport #4796) (backport #4812) #4852
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Handle errors when setting socket buffer sizes (#4760) (#4796) * Refs #20972. Method socket_buffer_size in DDS_PIM helpers sets also sending buffer. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Method socket_buffer_size in fastrtps_deprecated helpers sets also sending buffer. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Improvements in on_sample_lost blackbox tests. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Move code into new private methods. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Refactor on configure_send_buffer_size. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Refactor on configure_receive_buffer_size. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Check user configuration at the beginning of init method. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Use maxMessageSize as minimum possible value. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Applying changes on OpenAndBindUnicastOutputSocket. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Applying changes on CreateInputChannelResource. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Revert "Refs #20972. Applying changes on CreateInputChannelResource." This reverts commit ed848e9. * Refs #20972. Add helper header with template method. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Configure methods return boolean. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Configure methods use new template method. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. OpenAndBindUnicastOutputSocket uses new template method. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Changes in OpenAndBindInputSocket. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972.Setting options on TCP channels. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Doxygen. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Check limits of configured sizes. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Add UDP unit tests. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Add TCP unit tests. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Move checks in TCP to beginning of init. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Refactor for common code in UDP. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Refactor for common code in TCP. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Remove unused constants in UDP tests. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Check final configuration on unit tests. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Uncrustify. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Less strict tests. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Remove `s_minimumSocketBuffer` from tests. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #20972. Deprecate `s_minimumSocketBuffer`. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> (cherry picked from commit 53cd211) # Conflicts: # src/cpp/rtps/transport/TCPTransportInterface.cpp # src/cpp/rtps/transport/UDPTransportInterface.cpp # src/cpp/rtps/transport/UDPv4Transport.cpp # src/cpp/rtps/transport/UDPv6Transport.cpp # test/blackbox/common/DDSBlackboxTestsListeners.cpp * Refs #21036. Fix conflicts. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #21036. Update for non-backported changes Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com> Co-authored-by: Miguel Company <miguelcompany@eprosima.com> (cherry picked from commit 5d1c013) # Conflicts: # src/cpp/rtps/transport/TCPTransportInterface.cpp # src/cpp/rtps/transport/UDPTransportInterface.cpp # src/cpp/rtps/transport/UDPv4Transport.cpp # test/unittest/transport/TCPv6Tests.cpp # test/unittest/transport/UDPv4Tests.cpp # test/unittest/transport/UDPv6Tests.cpp
Cherry-pick of 5d1c013 has failed:
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally |
Merged
11 tasks
Closing this since I mistakenly merged it silently in #4607 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This is a manual backport of #4760 where
s_minimumSocketBuffer
has been deprecated instead of removed.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
Any new/modified methods have been properly documented using Doxygen.
N/A 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.
N/A New feature has been added to the
versions.md
file (if applicable).N/A New feature has been documented/Current behavior is correctly described in the documentation.
N/A Applicable backports have been included in the description.
Reviewer Checklist
This is an automatic backport of pull request #4796 done by [Mergify](https://mergify.com).
This is an automatic backport of pull request #4812 done by [Mergify](https://mergify.com).