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

Synchronize TCP reception to wait for RTCP header. [11562] #1957

Merged
merged 9 commits into from
May 14, 2021

Conversation

MiguelCompany
Copy link
Member

This PR should fix issue #1268 by always waiting for the RTCP header, consuming bytes if they come unordered.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
@richiware richiware changed the title Synchronize TCP reception to wait for RTCP header. Synchronize TCP reception to wait for RTCP header. [11562] May 13, 2021
richiware
richiware previously approved these changes May 13, 2021
@richiware
Copy link
Member

There are warnings. Please, fix them

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
richiware
richiware previously approved these changes May 14, 2021
Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
@MiguelCompany
Copy link
Member Author

Failing tests are not using TCP.
Only linter-related changes since approval.
Going in.

@MiguelCompany MiguelCompany merged commit 5a23fc4 into master May 14, 2021
@MiguelCompany MiguelCompany deleted the bugfix/9141/master branch May 14, 2021 10:12
@MiguelCompany
Copy link
Member Author

@mergify backport 2.2.x

mergify bot pushed a commit that referenced this pull request May 14, 2021
* Refs 9141. Add unit test for TCP reception of out of sequence header.

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

* Refs 9141. New mutex to protect asio::write calls on TCP.

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

* Refs 9141. Synchronize reception to RTCP.

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

* Refs 11562. Linters.

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

* Refs 11562. Fix warning.

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

* Refs 11562. Do not show warning on EOF error.

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

* Refs 11562. Tests improvements.

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

* Refs 11562. Fix number of bytes to skip.

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

* Refs 11562. Linters.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
(cherry picked from commit 5a23fc4)

# Conflicts:
#	test/unittest/transport/TCPv4Tests.cpp
@mergify
Copy link
Contributor

mergify bot commented May 14, 2021

Command backport 2.2.x: success

Backports have been created

Hey, I reacted but my real name is @Mergifyio

MiguelCompany added a commit that referenced this pull request May 20, 2021
* Synchronize TCP reception to wait for RTCP header (#1957)

* Refs 9141. Add unit test for TCP reception of out of sequence header.

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

* Refs 9141. New mutex to protect asio::write calls on TCP.

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

* Refs 9141. Synchronize reception to RTCP.

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

* Refs 11562. Linters.

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

* Refs 11562. Fix warning.

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

* Refs 11562. Do not show warning on EOF error.

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

* Refs 11562. Tests improvements.

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

* Refs 11562. Fix number of bytes to skip.

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

* Refs 11562. Linters.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
(cherry picked from commit 5a23fc4)

# Conflicts:
#	test/unittest/transport/TCPv4Tests.cpp

* Fixing rebase conflicts.

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

* Uncrustify

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

Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
mergify bot added a commit that referenced this pull request May 20, 2021
* Synchronize TCP reception to wait for RTCP header (#1957)

* Refs 9141. Add unit test for TCP reception of out of sequence header.

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

* Refs 9141. New mutex to protect asio::write calls on TCP.

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

* Refs 9141. Synchronize reception to RTCP.

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

* Refs 11562. Linters.

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

* Refs 11562. Fix warning.

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

* Refs 11562. Do not show warning on EOF error.

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

* Refs 11562. Tests improvements.

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

* Refs 11562. Fix number of bytes to skip.

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

* Refs 11562. Linters.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
(cherry picked from commit 5a23fc4)

# Conflicts:
#	test/unittest/transport/TCPv4Tests.cpp

* Fixing rebase conflicts.

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

* Uncrustify

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

Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 10aa9cf)
mergify bot added a commit that referenced this pull request May 20, 2021
* Synchronize TCP reception to wait for RTCP header (#1957)

* Refs 9141. Add unit test for TCP reception of out of sequence header.

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

* Refs 9141. New mutex to protect asio::write calls on TCP.

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

* Refs 9141. Synchronize reception to RTCP.

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

* Refs 11562. Linters.

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

* Refs 11562. Fix warning.

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

* Refs 11562. Do not show warning on EOF error.

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

* Refs 11562. Tests improvements.

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

* Refs 11562. Fix number of bytes to skip.

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

* Refs 11562. Linters.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
(cherry picked from commit 5a23fc4)

# Conflicts:
#	test/unittest/transport/TCPv4Tests.cpp

* Fixing rebase conflicts.

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

* Uncrustify

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

Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 10aa9cf)
MiguelCompany pushed a commit that referenced this pull request May 21, 2021
* Synchronize TCP reception to wait for RTCP header (#1957)

* Refs 9141. Add unit test for TCP reception of out of sequence header.

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

* Refs 9141. New mutex to protect asio::write calls on TCP.

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

* Refs 9141. Synchronize reception to RTCP.

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

* Refs 11562. Linters.

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

* Refs 11562. Fix warning.

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

* Refs 11562. Do not show warning on EOF error.

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

* Refs 11562. Tests improvements.

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

* Refs 11562. Fix number of bytes to skip.

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

* Refs 11562. Linters.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
(cherry picked from commit 5a23fc4)

# Conflicts:
#	test/unittest/transport/TCPv4Tests.cpp

* Fixing rebase conflicts.

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

* Uncrustify

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

Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 10aa9cf)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
MiguelCompany pushed a commit that referenced this pull request May 21, 2021
* Synchronize TCP reception to wait for RTCP header (#1957)

* Refs 9141. Add unit test for TCP reception of out of sequence header.

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

* Refs 9141. New mutex to protect asio::write calls on TCP.

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

* Refs 9141. Synchronize reception to RTCP.

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

* Refs 11562. Linters.

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

* Refs 11562. Fix warning.

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

* Refs 11562. Do not show warning on EOF error.

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

* Refs 11562. Tests improvements.

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

* Refs 11562. Fix number of bytes to skip.

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

* Refs 11562. Linters.

Signed-off-by: Miguel Company <MiguelCompany@eprosima.com>
(cherry picked from commit 5a23fc4)

# Conflicts:
#	test/unittest/transport/TCPv4Tests.cpp

* Fixing rebase conflicts.

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

* Uncrustify

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

Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 10aa9cf)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants