[7138] Bugfix/discovery server localhost

include/fastrtps/rtps/builtin/BuiltinProtocols.h

@@ -24,7 +24,7 @@
 #include <list>
 
 #include "../attributes/RTPSParticipantAttributes.h"
-
+#include "../network/NetworkFactory.h"
 
 namespace eprosima {
 
@@ -69,7 +69,16 @@ class BuiltinProtocols
      * @param loclist LocatorList to update
      * @return True on success
      */
-    bool updateMetatrafficLocators(LocatorList_t& loclist);
+    bool updateMetatrafficLocators(
+            LocatorList_t& loclist);
+
+    /**
+     * Traverses the list of discover servers translating from remote to local locators
+     * if possible
+     * @param nf NetworkFactory used to make the translation
+     */
+    void transform_server_remote_locators(
+            NetworkFactory & nf);
 
     //!BuiltinAttributes of the builtin protocols.
     BuiltinAttributes m_att;

src/cpp/rtps/builtin/BuiltinProtocols.cpp

@@ -79,6 +79,8 @@ bool BuiltinProtocols::initBuiltinProtocols(
     m_initialPeersList = m_att.initialPeersList;
     m_DiscoveryServers = m_att.discovery_config.m_DiscoveryServers;
 
+    transform_server_remote_locators(p_part->network_factory());
+
     const RTPSParticipantAllocationAttributes& allocation = p_part->getRTPSParticipantAttributes().allocation;
 
     // PDP
@@ -137,12 +139,29 @@ bool BuiltinProtocols::initBuiltinProtocols(
     return true;
 }
 
-bool BuiltinProtocols::updateMetatrafficLocators(LocatorList_t& loclist)
+bool BuiltinProtocols::updateMetatrafficLocators(
+        LocatorList_t& loclist)
 {
     m_metatrafficUnicastLocatorList = loclist;
     return true;
 }
 
+void BuiltinProtocols::transform_server_remote_locators(
+        NetworkFactory & nf)
+{
+    for(RemoteServerAttributes & rs : m_DiscoveryServers)
+    {
+        for(Locator_t & loc : rs.metatrafficUnicastLocatorList)
+        {
+            Locator_t localized;
+            if(nf.transform_remote_locator(loc, localized))
+            {
+                loc = localized;
+            }
+        }
+    }
+}
+
 bool BuiltinProtocols::addLocalWriter(
     RTPSWriter* w,
     const fastrtps::TopicAttributes& topicAtt,

src/cpp/rtps/builtin/data/ParticipantProxyData.cpp

@@ -17,6 +17,7 @@
  *
  */
 
+#include <fastrtps/rtps/network/NetworkFactory.h>
 #include <fastrtps/rtps/builtin/data/ParticipantProxyData.h>
 #include <fastrtps/rtps/builtin/data/WriterProxyData.h>
 #include <fastrtps/rtps/builtin/data/ReaderProxyData.h>

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

@@ -708,6 +708,8 @@ bool PDPServer::match_servers_EDP_endpoints()
 
 void PDPServer::announceParticipantState(bool new_change, bool dispose /* = false */, WriteParams& )
 {
+    logInfo(RTPS_PDP, "Announcing RTPSParticipant State (new change: " << new_change << ")");
+
     StatefulWriter * pW = dynamic_cast<StatefulWriter*>(mp_PDPWriter);
     assert(pW);