Fast-DDS icon indicating copy to clipboard operation
Fast-DDS copied to clipboard

[20119] TCP socket send buffer limit (backport #4237)

Open mergify[bot] opened this issue 1 year ago • 2 comments

This is an automatic backport of pull request #4237 done by Mergify. Cherry-pick of b5f8c8adcd06c42e25d2f8baeb5f00572588b16e has failed:

On branch mergify/bp/2.6.x/pr-4237
Your branch is up to date with 'origin/2.6.x'.

You are currently cherry-picking commit b5f8c8adc.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/cpp/rtps/attributes/RTPSParticipantAttributes.cpp
	modified:   src/cpp/rtps/transport/TCPChannelResource.cpp
	modified:   src/cpp/rtps/transport/TCPChannelResource.h
	modified:   src/cpp/rtps/transport/TCPChannelResourceBasic.cpp
	modified:   src/cpp/rtps/transport/TCPChannelResourceSecure.cpp

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   src/cpp/rtps/transport/TCPTransportInterface.cpp
	both modified:   src/cpp/rtps/transport/TCPTransportInterface.h
	both modified:   test/unittest/transport/TCPv4Tests.cpp
	both modified:   test/unittest/transport/TCPv6Tests.cpp
	both modified:   test/unittest/transport/mock/MockTCPv4Transport.h
	deleted by us:   test/unittest/transport/mock/MockTCPv6Transport.h
	both modified:   versions.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

mergify[bot] avatar Jan 30 '24 14:01 mergify[bot]

This has been rebased on top of #4287, and should be merged after.

MiguelCompany avatar Jan 30 '24 14:01 MiguelCompany

  • Merge after #4287

jepemi avatar Feb 23 '24 12:02 jepemi

@jepemi would you mind rebasing on top of 2.6.x and solving the conflicts here ? This is the next in the row :smile:

Mario-DL avatar Mar 18 '24 15:03 Mario-DL

@richiprosima please test this

Mario-DL avatar Mar 20 '24 07:03 Mario-DL

Failed tests in github ci unrelated. Ready to merge

Mario-DL avatar Mar 25 '24 06:03 Mario-DL