Refs #20629: Avoid SC matching with remote servers

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

Author: cferreiragonz

src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.cpp

@@ -610,7 +610,8 @@ void DiscoveryDataBase::create_participant_from_change_(
 }
 
 void DiscoveryDataBase::match_new_server_(
-        eprosima::fastrtps::rtps::GuidPrefix_t& participant_prefix)
+        eprosima::fastrtps::rtps::GuidPrefix_t& participant_prefix,
+        bool is_superclient)
 {
     // Send Our DATA(p) to the new participant.
     // If this is not done, our data could be skipped afterwards because of a gap sent in newer DATA(p)s,
@@ -619,40 +620,43 @@ void DiscoveryDataBase::match_new_server_(
     assert(our_data_it != participants_.end());
     add_pdp_to_send_(our_data_it->second.change());
 
-    // To obtain a mesh topology, we need to:
-    // - Make all known servers relevant to the new server
-    // - Make the new server relevant to all known servers
-    // - Send DATA(p) of all known servers to the new server
-    // - Send Data(p) of the new server to all other servers
-    for (auto& part : participants_)
+    if (!is_superclient)
     {
-        if (part.first != server_guid_prefix_ && !part.second.is_client())
+        // To obtain a mesh topology with servers, we need to:
+        // - Make all known servers relevant to the new server
+        // - Make the new server relevant to all known servers
+        // - Send DATA(p) of all known servers to the new server
+        // - Send Data(p) of the new server to all other servers
+        for (auto& part : participants_)
         {
-            if (part.first == participant_prefix)
+            if (part.first != server_guid_prefix_ && !part.second.is_client() && !part.second.is_superclient())
             {
-                bool resend_new_pdp = false;
-                for (auto& server: servers_)
+                if (part.first == participant_prefix)
                 {
-                    if (server != participant_prefix)
+                    bool resend_new_pdp = false;
+                    for (auto& server: servers_)
+                    {
+                        if (server != participant_prefix)
+                        {
+                            // Make all known servers relevant to the new server, but not matched
+                            part.second.add_or_update_ack_participant(server, false);
+                            resend_new_pdp = true;
+                        }
+                    }
+                    if (resend_new_pdp)
                     {
-                        // Make all known servers relevant to the new server, but not matched
-                        part.second.add_or_update_ack_participant(server, false);
-                        resend_new_pdp = true;
+                        // Send DATA(p) of the new server to all other servers.
+                        add_pdp_to_send_(part.second.change());
                     }
                 }
-                if (resend_new_pdp)
+                else
                 {
-                    // Send DATA(p) of the new server to all other servers.
+                    // Make the new server relevant to all known servers
+                    part.second.add_or_update_ack_participant(participant_prefix, false);
+                    // Send DATA(p) of all known servers to the new participant
                     add_pdp_to_send_(part.second.change());
                 }
             }
-            else
-            {
-                // Make the new server relevant to all known servers
-                part.second.add_or_update_ack_participant(participant_prefix, false);
-                // Send DATA(p) of all known servers to the new participant
-                add_pdp_to_send_(part.second.change());
-            }
         }
     }
     // The resources needed for TCP new connections are created during the matching process when the
@@ -768,7 +772,7 @@ void DiscoveryDataBase::create_new_participant_from_change_(
                 !ret.first->second.is_client() && ret.first->second.is_local())
         {
             // Match new server and create virtual endpoints
-            match_new_server_(change_guid.guidPrefix);
+            match_new_server_(change_guid.guidPrefix, change_data.is_superclient());
         }
     }
     else
@@ -795,7 +799,7 @@ void DiscoveryDataBase::update_participant_from_change_(
         // If it is local and server the only possibility is it was a remote server and it must be converted to local
         if (!change_data.is_client())
         {
-            match_new_server_(change_guid.guidPrefix);
+            match_new_server_(change_guid.guidPrefix, change_data.is_superclient());
         }
 
         // Update the change data

src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.hpp

@@ -396,7 +396,8 @@ class DiscoveryDataBase
     // Functions related with create_participant_from_change_
 
     void match_new_server_(
-            eprosima::fastrtps::rtps::GuidPrefix_t& participant_prefix);
+            eprosima::fastrtps::rtps::GuidPrefix_t& participant_prefix,
+            bool is_superclient);
 
     void create_virtual_endpoints_(
             eprosima::fastrtps::rtps::GuidPrefix_t& participant_prefix);

src/cpp/rtps/builtin/discovery/participant/PDPServerListener.cpp

@@ -313,7 +313,7 @@ void PDPServerListener::onNewCacheChangeAdded(
 
                 // All local builtins are connected, the database will avoid any EDP DATA to be send before having PDP
                 // DATA acknowledgement. Non-local SERVERs will also be connected
-                if ( pdata && (is_local || !is_client))
+                if (pdata && (is_local || (!is_client && !is_superclient)))
                 {
                     pdp_server()->assignRemoteEndpoints(pdata);
                 }