Skip to content

Commit

Permalink
Apply more suggestions
Browse files Browse the repository at this point in the history
Signed-off-by: Juan Lopez Fernandez <[email protected]>
  • Loading branch information
juanlofer-eprosima committed Mar 14, 2024
1 parent 38553e9 commit 10e6f10
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 11 deletions.
6 changes: 4 additions & 2 deletions include/fastdds/rtps/participant/RTPSParticipant.h
Original file line number Diff line number Diff line change
Expand Up @@ -300,9 +300,11 @@ class RTPS_DllAPI RTPSParticipant
const GUID_t& reader_guid);

/**
* Returns registered transports' netmask filter information (transport's netmask filter kind and allowlist).
* @brief Returns registered transports' netmask filter information (transport's netmask filter kind and allowlist).
*
* @return A vector with all registered transports' netmask filter information.
*/
std::vector<fastdds::rtps::TransportNetmaskFilterInfo> netmask_filter_info() const;
std::vector<fastdds::rtps::TransportNetmaskFilterInfo> get_netmask_filter_info() const;

#if HAVE_SECURITY

Expand Down
4 changes: 2 additions & 2 deletions src/cpp/fastdds/publisher/PublisherImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -243,10 +243,10 @@ DataWriter* PublisherImpl::create_datawriter(
}

// Check netmask filtering preconditions
if (nullptr != rtps_participant())
if (nullptr != rtps_participant_)
{
std::vector<fastdds::rtps::TransportNetmaskFilterInfo> netmask_filter_info =
rtps_participant()->netmask_filter_info();
rtps_participant_->get_netmask_filter_info();
std::string error_msg;
if (!fastdds::rtps::network::netmask_filter::check_preconditions(netmask_filter_info,
qos.endpoint().ignore_non_matching_locators,
Expand Down
4 changes: 2 additions & 2 deletions src/cpp/fastdds/subscriber/SubscriberImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -212,10 +212,10 @@ DataReader* SubscriberImpl::create_datareader(
}

// Check netmask filtering preconditions
if (nullptr != rtps_participant())
if (nullptr != rtps_participant_)
{
std::vector<fastdds::rtps::TransportNetmaskFilterInfo> netmask_filter_info =
rtps_participant()->netmask_filter_info();
rtps_participant_->get_netmask_filter_info();
std::string error_msg;
if (!fastdds::rtps::network::netmask_filter::check_preconditions(netmask_filter_info,
qos.endpoint().ignore_non_matching_locators,
Expand Down
4 changes: 2 additions & 2 deletions src/cpp/rtps/participant/RTPSParticipant.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -196,9 +196,9 @@ bool RTPSParticipant::ignore_reader(
return false;
}

std::vector<fastdds::rtps::TransportNetmaskFilterInfo> RTPSParticipant::netmask_filter_info() const
std::vector<fastdds::rtps::TransportNetmaskFilterInfo> RTPSParticipant::get_netmask_filter_info() const
{
return mp_impl->netmask_filter_info();
return mp_impl->get_netmask_filter_info();
}

#if HAVE_SECURITY
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/participant/RTPSParticipantImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2760,7 +2760,7 @@ bool RTPSParticipantImpl::ignore_reader(
return false;
}

std::vector<fastdds::rtps::TransportNetmaskFilterInfo> RTPSParticipantImpl::netmask_filter_info() const
std::vector<fastdds::rtps::TransportNetmaskFilterInfo> RTPSParticipantImpl::get_netmask_filter_info() const
{
return m_network_Factory.netmask_filter_info();
}
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/rtps/participant/RTPSParticipantImpl.h
Original file line number Diff line number Diff line change
Expand Up @@ -1104,7 +1104,7 @@ class RTPSParticipantImpl
/**
* Returns registered transports' netmask filter information (transport's netmask filter kind and allowlist).
*/
std::vector<fastdds::rtps::TransportNetmaskFilterInfo> netmask_filter_info() const;
std::vector<fastdds::rtps::TransportNetmaskFilterInfo> get_netmask_filter_info() const;

template <EndpointKind_t kind, octet no_key, octet with_key>
static bool preprocess_endpoint_attributes(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ class RTPS_DllAPI RTPSParticipant
const ReaderQos& rqos,
const fastdds::rtps::ContentFilterProperty* content_filter));

std::vector<fastdds::rtps::TransportNetmaskFilterInfo> netmask_filter_info() const
std::vector<fastdds::rtps::TransportNetmaskFilterInfo> get_netmask_filter_info() const
{
return {};
}
Expand Down

0 comments on commit 10e6f10

Please sign in to comment.