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

Signed-off-by: Miguel Company <[email protected]>
eProsima · Aug 26, 2024 · 13b778b · 13b778b
1 parent af60d6f
commit 13b778b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
@@ -568,8 +568,13 @@ void PDPSimple::removeRemoteEndpoints(
         ParticipantProxyData* pdata)
 {
     EPROSIMA_LOG_INFO(RTPS_PDP, "For RTPSParticipant: " << pdata->m_guid);
+    unmatch_pdp_remote_endpoints(pdata->m_guid);
+}
 
-    GUID_t guid = pdata->m_guid;
+void PDPSimple::unmatch_pdp_remote_endpoints(
+        const GUID_t& participant_guid)
+{
+    GUID_t guid = participant_guid;
 
     {
         auto endpoints = dynamic_cast<fastdds::rtps::SimplePDPEndpoints*>(builtin_endpoints_.get());
@@ -601,6 +606,7 @@ void PDPSimple::notifyAboveRemoteEndpoints(
 {
     if (notify_secure_endpoints)
     {
+        unmatch_pdp_remote_endpoints(pdata.m_guid);
         match_pdp_remote_endpoints(pdata, true, false);
     }
     else

diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.h b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.h
@@ -146,6 +146,14 @@ class PDPSimple : public PDP
             bool notify_secure_endpoints,
             bool writer_only);
 
+    /**
+     * @brief Unmatch PDP endpoints with a remote participant.
+     *
+     * @param participant_guid GUID of the remote participant.
+     */
+    void unmatch_pdp_remote_endpoints(
+            const GUID_t& participant_guid);
+
     void assign_low_level_remote_endpoints(
             const ParticipantProxyData& pdata,
             bool notify_secure_endpoints);