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.

Sign up for GitHub

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

Jump to bottom

[20181] Hotfix: Secure simple participants with initialpeers over TCP match (backport #5071) #5177

Merged
merged 2 commits into from
Sep 20, 2024
Merged

[20181] Hotfix: Secure simple participants with initialpeers over TCP match (backport #5071) #5177

merged 2 commits into from
Sep 20, 2024

Commits on Sep 18, 2024

  1. Hotfix: Secure simple participants with initialpeers over TCP mat… 

    …ch (#5071)

* Refs #20181: Add BB test

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #20181: Add Fix

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #20181: linter

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #20181. Pass in secure_endpoints as lambda capture.

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

* Refs #20181. New approach.

Automatically sending DATA(p) when receiving a DATA(p) could lead to an infinite ping-pong between the two participants.
This resulted in some cases in the transport threads eating all CPU resources.

The new approach matches the discovered participant to the builtin non-secure PDP writer, so it will receive the DATA(p) of the local participant in the next periodic announcement.

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

* Refs #20181. Unmatch non-secure before matching secure.

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

---------

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 3ca60e0)

# Conflicts:
#	src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
#	test/blackbox/common/BlackboxTestsSecurity.cpp
    @Mario-DL @MiguelCompany
    Mario-DL authored and MiguelCompany committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    0c610e9 View commit details
    Browse the repository at this point in the history

  2. Fix conflicts 

    Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
    @MiguelCompany
    MiguelCompany committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    388945f View commit details
    Browse the repository at this point in the history