eProsima · richiware · Sep 19, 2018 · Sep 14, 2018
diff --git a/include/fastrtps/publisher/Publisher.h b/include/fastrtps/publisher/Publisher.h
@@ -43,10 +43,13 @@ class PublisherImpl;
  * Class Publisher, used to send data to associated subscribers.
  * @ingroup FASTRTPS_MODULE
  */
-class RTPS_DllAPI Publisher {
+class RTPS_DllAPI Publisher
+{
 	friend class PublisherImpl;
 	virtual ~Publisher();
+
 public:
+
 	Publisher(PublisherImpl* pimpl);
 
 	/**
@@ -94,7 +97,7 @@ class RTPS_DllAPI Publisher {
 	 */
 	bool removeAllChange(size_t* removed = nullptr);
 
-   bool wait_for_all_acked(const rtps::Time_t& max_wait);
+    bool wait_for_all_acked(const rtps::Time_t& max_wait);
 
 	/**
 	 * Get the GUID_t of the associated RTPSWriter.
@@ -106,7 +109,7 @@ class RTPS_DllAPI Publisher {
 	 * Get the Attributes of the Publisher.
 	 * @return Attributes of the publisher
 	 */
-	PublisherAttributes getAttributes() const;
+    const PublisherAttributes& getAttributes() const;
 
 private:
 	PublisherImpl* mp_impl;

diff --git a/include/fastrtps/rtps/Endpoint.h b/include/fastrtps/rtps/Endpoint.h
@@ -46,19 +46,16 @@ class Endpoint
 {
     friend class RTPSParticipantImpl;
 
-    protected:
-
+protected:
     Endpoint(RTPSParticipantImpl* pimpl,GUID_t& guid,EndpointAttributes& att);
-
     virtual ~Endpoint();
 
-    public:
-
+public:
     /**
      * Get associated GUID
      * @return Associated GUID
      */
-    RTPS_DllAPI inline const GUID_t& getGuid() const { return m_guid; };
+    RTPS_DllAPI inline const GUID_t& getGuid() const { return m_guid; }
 
     /**
      * Get mutex
@@ -70,12 +67,13 @@ class Endpoint
      * Get associated attributes
      * @return Endpoint attributes
      */
-    RTPS_DllAPI inline EndpointAttributes* getAttributes() { return &m_att; }
+    RTPS_DllAPI inline EndpointAttributes& getAttributes() { return m_att; }
 
 #if HAVE_SECURITY
     bool supports_rtps_protection() { return supports_rtps_protection_; }
 #endif
-    protected:
+
+protected:
     //!Pointer to the RTPSParticipant containing this endpoint.
     RTPSParticipantImpl* mp_RTPSParticipant;
     //!Endpoint GUID
@@ -85,8 +83,7 @@ class Endpoint
     //!Endpoint Mutex
     std::recursive_mutex* mp_mutex;
 
-    private:
-
+private:
     Endpoint& operator=(const Endpoint&) = delete;
 
 #if HAVE_SECURITY

diff --git a/include/fastrtps/subscriber/Subscriber.h b/include/fastrtps/subscriber/Subscriber.h
@@ -40,13 +40,13 @@ class SampleInfo_t;
 class RTPS_DllAPI Subscriber
 {
     friend class SubscriberImpl;
-    virtual ~Subscriber(){};
-    public:
+    virtual ~Subscriber(){}
+
+public:
     /**
      * @param pimpl Actual implementation of the subscriber
      */
-    Subscriber(SubscriberImpl* pimpl):mp_impl(pimpl){};
-
+    Subscriber(SubscriberImpl* pimpl) : mp_impl(pimpl) {}
 
     /**
      * Get the associated GUID
@@ -86,7 +86,7 @@ class RTPS_DllAPI Subscriber
      * Get the Attributes of the Subscriber.
      * @return Attributes of the subscriber
      */
-    SubscriberAttributes getAttributes() const;
+    const SubscriberAttributes& getAttributes() const;
 
     /*!
      * @brief Returns there is a clean state with all Publishers.
@@ -102,8 +102,7 @@ class RTPS_DllAPI Subscriber
      */
     uint64_t getUnreadCount() const;
 
-    private:
-
+private:
     SubscriberImpl* mp_impl;
 };
 

diff --git a/src/cpp/publisher/Publisher.cpp b/src/cpp/publisher/Publisher.cpp
@@ -80,7 +80,7 @@ const GUID_t& Publisher::getGuid()
     return mp_impl->getGuid();
 }
 
-PublisherAttributes Publisher::getAttributes() const
+const PublisherAttributes& Publisher::getAttributes() const
 {
     return mp_impl->getAttributes();
 }
diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp
@@ -64,14 +64,14 @@ bool EDP::newLocalReaderProxyData(RTPSReader* reader, TopicAttributes& att, Read
     rpd.m_expectsInlineQos = reader->expectsInlineQos();
     rpd.guid(reader->getGuid());
     rpd.key() = rpd.guid();
-    rpd.multicastLocatorList(reader->getAttributes()->multicastLocatorList);
-    rpd.unicastLocatorList(reader->getAttributes()->unicastLocatorList);
+    rpd.multicastLocatorList(reader->getAttributes().multicastLocatorList);
+    rpd.unicastLocatorList(reader->getAttributes().unicastLocatorList);
     rpd.RTPSParticipantKey() = mp_RTPSParticipant->getGuid();
     rpd.topicName(att.getTopicName());
     rpd.typeName(att.getTopicDataType());
     rpd.topicKind(att.getTopicKind());
     rpd.m_qos = rqos;
-    rpd.userDefinedId(reader->getAttributes()->getUserDefinedID());
+    rpd.userDefinedId(reader->getAttributes().getUserDefinedID());
     reader->m_acceptMessagesFromUnkownWriters = false;
 
     //ADD IT TO THE LIST OF READERPROXYDATA
@@ -96,16 +96,16 @@ bool EDP::newLocalWriterProxyData(RTPSWriter* writer,TopicAttributes& att, Write
     wpd.isAlive(true);
     wpd.guid(writer->getGuid());
     wpd.key() = wpd.guid();
-    wpd.multicastLocatorList(writer->getAttributes()->multicastLocatorList);
-    wpd.unicastLocatorList(writer->getAttributes()->unicastLocatorList);
+    wpd.multicastLocatorList(writer->getAttributes().multicastLocatorList);
+    wpd.unicastLocatorList(writer->getAttributes().unicastLocatorList);
     wpd.RTPSParticipantKey() = mp_RTPSParticipant->getGuid();
     wpd.topicName(att.getTopicName());
     wpd.typeName(att.getTopicDataType());
     wpd.topicKind(att.getTopicKind());
     wpd.typeMaxSerialized(writer->getTypeMaxSerialized());
     wpd.m_qos = wqos;
-    wpd.userDefinedId(writer->getAttributes()->getUserDefinedID());
-    wpd.persistence_guid(writer->getAttributes()->persistence_guid);
+    wpd.userDefinedId(writer->getAttributes().getUserDefinedID());
+    wpd.persistence_guid(writer->getAttributes().persistence_guid);
 
     //ADD IT TO THE LIST OF READERPROXYDATA
     ParticipantProxyData pdata;
@@ -422,7 +422,7 @@ bool EDP::pairingReader(RTPSReader* R, const ParticipantProxyData& pdata, const
             {
 #if HAVE_SECURITY
                 if(!mp_RTPSParticipant->security_manager().discovered_writer(R->m_guid, (*pit)->m_guid,
-                            **wdatait, R->getAttributes()->security_attributes()))
+                            **wdatait, R->getAttributes().security_attributes()))
                 {
                     logError(RTPS_EDP, "Security manager returns an error for reader " << R->getGuid());
                 }
@@ -486,7 +486,7 @@ bool EDP::pairingWriter(RTPSWriter* W, const ParticipantProxyData& pdata, const
             {
 #if HAVE_SECURITY
                 if(!mp_RTPSParticipant->security_manager().discovered_reader(W->getGuid(), (*pit)->m_guid,
-                            **rdatait, W->getAttributes()->security_attributes()))
+                            **rdatait, W->getAttributes().security_attributes()))
                 {
                     logError(RTPS_EDP, "Security manager returns an error for writer " << W->getGuid());
                 }
@@ -552,7 +552,7 @@ bool EDP::pairing_reader_proxy_with_any_local_writer(ParticipantProxyData* pdata
             {
 #if HAVE_SECURITY
                 if(!mp_RTPSParticipant->security_manager().discovered_reader(writerGUID, pdata->m_guid,
-                            *rdata, (*wit)->getAttributes()->security_attributes()))
+                            *rdata, (*wit)->getAttributes().security_attributes()))
                 {
                     logError(RTPS_EDP, "Security manager returns an error for writer " << writerGUID);
                 }
@@ -620,7 +620,7 @@ bool EDP::pairing_reader_proxy_with_local_writer(const GUID_t& local_writer, con
                 if(valid)
                 {
                     if(!mp_RTPSParticipant->security_manager().discovered_reader(writerGUID,
-                                remote_participant_guid, rdata, (*wit)->getAttributes()->security_attributes()))
+                                remote_participant_guid, rdata, (*wit)->getAttributes().security_attributes()))
                     {
                         logError(RTPS_EDP, "Security manager returns an error for writer " << writerGUID);
                     }
@@ -710,7 +710,7 @@ bool EDP::pairing_writer_proxy_with_any_local_reader(ParticipantProxyData *pdata
             {
 #if HAVE_SECURITY
                 if(!mp_RTPSParticipant->security_manager().discovered_writer(readerGUID, pdata->m_guid,
-                            *wdata, (*rit)->getAttributes()->security_attributes()))
+                            *wdata, (*rit)->getAttributes().security_attributes()))
                 {
                     logError(RTPS_EDP, "Security manager returns an error for reader " << readerGUID);
                 }
@@ -778,7 +778,7 @@ bool EDP::pairing_writer_proxy_with_local_reader(const GUID_t& local_reader, con
                 if(valid)
                 {
                     if(!mp_RTPSParticipant->security_manager().discovered_writer(readerGUID,
-                                remote_participant_guid, wdata, (*rit)->getAttributes()->security_attributes()))
+                                remote_participant_guid, wdata, (*rit)->getAttributes().security_attributes()))
                     {
                         logError(RTPS_EDP, "Security manager returns an error for reader " << readerGUID);
                     }

diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp
@@ -442,7 +442,7 @@ bool EDPSimple::processLocalReaderProxyData(RTPSReader* local_reader, ReaderProx
     auto* reader = &mp_SubReader;
 
 #if HAVE_SECURITY
-    if(local_reader->getAttributes()->security_attributes().is_discovered_protected)
+    if(local_reader->getAttributes().security_attributes().is_discovered_protected)
     {
         writer = &sedp_builtin_subscriptions_secure_writer_;
         reader = &sedp_builtin_subscriptions_secure_reader_;
@@ -507,7 +507,7 @@ bool EDPSimple::processLocalWriterProxyData(RTPSWriter* local_writer, WriterProx
     auto* reader = &mp_PubReader;
 
 #if HAVE_SECURITY
-    if(local_writer->getAttributes()->security_attributes().is_discovered_protected)
+    if(local_writer->getAttributes().security_attributes().is_discovered_protected)
     {
         writer = &sedp_builtin_publications_secure_writer_;
         reader = &sedp_builtin_publications_secure_reader_;
@@ -568,7 +568,7 @@ bool EDPSimple::removeLocalWriter(RTPSWriter* W)
     auto* reader = &mp_PubReader;
 
 #if HAVE_SECURITY
-    if(W->getAttributes()->security_attributes().is_discovered_protected)
+    if(W->getAttributes().security_attributes().is_discovered_protected)
     {
         writer = &sedp_builtin_publications_secure_writer_;
         reader = &sedp_builtin_publications_secure_reader_;
@@ -613,7 +613,7 @@ bool EDPSimple::removeLocalReader(RTPSReader* R)
     auto* reader = &mp_SubReader;
 
 #if HAVE_SECURITY
-    if(R->getAttributes()->security_attributes().is_discovered_protected)
+    if(R->getAttributes().security_attributes().is_discovered_protected)
     {
         writer = &sedp_builtin_subscriptions_secure_writer_;
         reader = &sedp_builtin_subscriptions_secure_reader_;
@@ -741,7 +741,7 @@ void EDPSimple::assignRemoteEndpoints(const ParticipantProxyData& pdata)
         watt.m_qos.m_durability.kind = TRANSIENT_LOCAL_DURABILITY_QOS;
         if(!mp_RTPSParticipant->security_manager().discovered_builtin_writer(
                     sedp_builtin_publications_secure_reader_.first->getGuid(), pdata.m_guid, watt,
-                    sedp_builtin_publications_secure_reader_.first->getAttributes()->security_attributes()))
+                    sedp_builtin_publications_secure_reader_.first->getAttributes().security_attributes()))
         {
             logError(RTPS_EDP, "Security manager returns an error for writer " <<
                     sedp_builtin_publications_secure_reader_.first->getGuid());
@@ -764,7 +764,7 @@ void EDPSimple::assignRemoteEndpoints(const ParticipantProxyData& pdata)
         ratt.m_qos.m_reliability.kind = RELIABLE_RELIABILITY_QOS;
         if(!mp_RTPSParticipant->security_manager().discovered_builtin_reader(
                     sedp_builtin_publications_secure_writer_.first->getGuid(), pdata.m_guid, ratt,
-                    sedp_builtin_publications_secure_writer_.first->getAttributes()->security_attributes()))
+                    sedp_builtin_publications_secure_writer_.first->getAttributes().security_attributes()))
         {
             logError(RTPS_EDP, "Security manager returns an error for writer " <<
                     sedp_builtin_publications_secure_writer_.first->getGuid());
@@ -787,7 +787,7 @@ void EDPSimple::assignRemoteEndpoints(const ParticipantProxyData& pdata)
         watt.m_qos.m_durability.kind = TRANSIENT_LOCAL_DURABILITY_QOS;
         if(!mp_RTPSParticipant->security_manager().discovered_builtin_writer(
                     sedp_builtin_subscriptions_secure_reader_.first->getGuid(), pdata.m_guid, watt,
-                    sedp_builtin_subscriptions_secure_reader_.first->getAttributes()->security_attributes()))
+                    sedp_builtin_subscriptions_secure_reader_.first->getAttributes().security_attributes()))
         {
             logError(RTPS_EDP, "Security manager returns an error for writer " <<
                     sedp_builtin_subscriptions_secure_reader_.first->getGuid());
@@ -811,7 +811,7 @@ void EDPSimple::assignRemoteEndpoints(const ParticipantProxyData& pdata)
         ratt.m_qos.m_reliability.kind = RELIABLE_RELIABILITY_QOS;
         if(!mp_RTPSParticipant->security_manager().discovered_builtin_reader(
                     sedp_builtin_subscriptions_secure_writer_.first->getGuid(), pdata.m_guid, ratt,
-                    sedp_builtin_subscriptions_secure_writer_.first->getAttributes()->security_attributes()))
+                    sedp_builtin_subscriptions_secure_writer_.first->getAttributes().security_attributes()))
         {
             logError(RTPS_EDP, "Security manager returns an error for writer " <<
                     sedp_builtin_subscriptions_secure_writer_.first->getGuid());

diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPStatic.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPStatic.cpp
@@ -138,7 +138,7 @@ bool EDPStatic::removeLocalReader(RTPSReader* R)
         {
             if(staticproperty.m_entityId == R->getGuid().entityId)
             {
-                *pit = EDPStaticProperty::toProperty("Reader","ENDED",R->getAttributes()->getUserDefinedID(),
+                *pit = EDPStaticProperty::toProperty("Reader","ENDED",R->getAttributes().getUserDefinedID(),
                         R->getGuid().entityId);
             }
         }
@@ -158,7 +158,7 @@ bool EDPStatic::removeLocalWriter(RTPSWriter*W)
         {
             if(staticproperty.m_entityId == W->getGuid().entityId)
             {
-                *pit = EDPStaticProperty::toProperty("Writer","ENDED",W->getAttributes()->getUserDefinedID(),
+                *pit = EDPStaticProperty::toProperty("Writer","ENDED",W->getAttributes().getUserDefinedID(),
                         W->getGuid().entityId);
             }
         }

diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
@@ -196,7 +196,7 @@ bool PDPSimple::initPDP(RTPSParticipantImpl* part)
     if(!createSPDPEndpoints())
         return false;
     //UPDATE METATRAFFIC.
-    mp_builtin->updateMetatrafficLocators(this->mp_SPDPReader->getAttributes()->unicastLocatorList);
+    mp_builtin->updateMetatrafficLocators(this->mp_SPDPReader->getAttributes().unicastLocatorList);
     m_participantProxies.push_back(new ParticipantProxyData());
     initializeParticipantProxyData(m_participantProxies.front());
 
@@ -798,7 +798,7 @@ void PDPSimple::assertRemoteWritersLiveliness(GuidPrefix_t& guidP,LivelinessQosP
                     for(std::vector<RTPSReader*>::iterator rit = mp_RTPSParticipant->userReadersListBegin();
                             rit!=mp_RTPSParticipant->userReadersListEnd();++rit)
                     {
-                        if((*rit)->getAttributes()->reliabilityKind == RELIABLE)
+                        if((*rit)->getAttributes().reliabilityKind == RELIABLE)
                         {
                             StatefulReader* sfr = (StatefulReader*)(*rit);
                             WriterProxy* WP;

diff --git a/src/cpp/rtps/messages/MessageReceiver.cpp b/src/cpp/rtps/messages/MessageReceiver.cpp
@@ -87,7 +87,7 @@ MessageReceiver::~MessageReceiver()
 void MessageReceiver::associateEndpoint(Endpoint *to_add){
     bool found = false;
     std::lock_guard<std::mutex> guard(mtx);
-    if(to_add->getAttributes()->endpointKind == WRITER)
+    if(to_add->getAttributes().endpointKind == WRITER)
     {
         for(auto it = AssociatedWriters.begin(); it != AssociatedWriters.end(); ++it)
         {
@@ -116,7 +116,7 @@ void MessageReceiver::associateEndpoint(Endpoint *to_add){
 void MessageReceiver::removeEndpoint(Endpoint *to_remove){
 
     std::lock_guard<std::mutex> guard(mtx);
-    if(to_remove->getAttributes()->endpointKind == WRITER){
+    if(to_remove->getAttributes().endpointKind == WRITER){
         RTPSWriter* var = (RTPSWriter *)to_remove;
         for(auto it=AssociatedWriters.begin(); it !=AssociatedWriters.end(); ++it){
             if ((*it) == var){
@@ -891,7 +891,7 @@ bool MessageReceiver::proc_Submsg_Acknack(CDRMessage_t* msg,SubmessageHeader_t*
     {
         if((*it)->getGuid() == writerGUID)
         {
-            if((*it)->getAttributes()->reliabilityKind == RELIABLE)
+            if((*it)->getAttributes().reliabilityKind == RELIABLE)
             {
                 StatefulWriter* SF = (StatefulWriter*)(*it);
                 SF->process_acknack(readerGUID, Ackcount, SNSet, finalFlag);
@@ -1057,7 +1057,7 @@ bool MessageReceiver::proc_Submsg_NackFrag(CDRMessage_t*msg, SubmessageHeader_t*
         std::lock_guard<std::recursive_mutex> guardW(*(*it)->getMutex());
         if ((*it)->getGuid() == writerGUID)
         {
-            if ((*it)->getAttributes()->reliabilityKind == RELIABLE)
+            if ((*it)->getAttributes().reliabilityKind == RELIABLE)
             {
                 StatefulWriter* SF = (StatefulWriter*)(*it);