summaryrefslogtreecommitdiff
path: root/implementation/service_discovery/src/service_discovery_impl.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'implementation/service_discovery/src/service_discovery_impl.cpp')
-rw-r--r--implementation/service_discovery/src/service_discovery_impl.cpp16
1 files changed, 4 insertions, 12 deletions
diff --git a/implementation/service_discovery/src/service_discovery_impl.cpp b/implementation/service_discovery/src/service_discovery_impl.cpp
index b252e62..1f5dc07 100644
--- a/implementation/service_discovery/src/service_discovery_impl.cpp
+++ b/implementation/service_discovery/src/service_discovery_impl.cpp
@@ -166,13 +166,8 @@ service_discovery_impl::start() {
}
if (endpoint_ && !reliable_) {
// rejoin multicast group
-#ifndef ANDROID
- reinterpret_cast<udp_server_endpoint_impl*>(
- endpoint_.get())->join(sd_multicast_);
-#else
dynamic_cast<udp_server_endpoint_impl*>(
endpoint_.get())->join(sd_multicast_);
-#endif
}
}
is_suspended_ = false;
@@ -2610,11 +2605,11 @@ service_discovery_impl::check_ipv4_address(
//Check unallowed ipv4 address
bool is_valid = true;
- static const boost::asio::ip::address_v4::bytes_type its_unicast_address =
+ const boost::asio::ip::address_v4::bytes_type its_unicast_address =
unicast_.to_v4().to_bytes();
const boost::asio::ip::address_v4::bytes_type endpoint_address =
its_address.to_v4().to_bytes();
- static const boost::asio::ip::address_v4::bytes_type its_netmask =
+ const boost::asio::ip::address_v4::bytes_type its_netmask =
configuration_->get_netmask().to_v4().to_bytes();
//same address as unicast address of DUT not allowed
@@ -3351,13 +3346,8 @@ service_discovery_impl::on_last_msg_received_timer_expired(
// Rejoin multicast group
if (endpoint_ && !reliable_) {
-#ifndef ANDROID
- reinterpret_cast<udp_server_endpoint_impl*>(
- endpoint_.get())->join(sd_multicast_);
-#else
dynamic_cast<udp_server_endpoint_impl*>(
endpoint_.get())->join(sd_multicast_);
-#endif
}
{
boost::system::error_code ec;
@@ -3742,8 +3732,10 @@ reliability_type_e service_discovery_impl::get_eventgroup_reliability(
<< std::hex << std::setw(4) << std::setfill('0') << _instance << "."
<< std::hex << std::setw(4) << std::setfill('0') << _eventgroup << "]";
}
+
return its_reliability;
}
+
} // namespace sd
} // namespace vsomeip_v3