Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions include/roar/dns/resolve.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,8 @@ namespace Roar::Dns
ResolverType resolver{executor};

boost::system::error_code ec;
typename ResolverType::iterator end, start = resolver.resolve(host.c_str(), port.c_str(), flags, ec);
std::vector<typename ResolverType::endpoint_type> endpoints(start, end);
auto result = resolver.resolve(host.c_str(), port.c_str(), flags, ec);
std::vector<typename ResolverType::endpoint_type> endpoints{result.begin(), result.end()};

if (endpoints.empty())
throw std::runtime_error("Cannot resolve passed host.");
Expand All @@ -179,7 +179,7 @@ namespace Roar::Dns
PickerFunctionT&& picker,
boost::asio::ip::resolver_base::flags flags = {})
{
return resolve<ExecutorType, PickerFunctionT, Protocol>(
return resolveSelect<ExecutorType, PickerFunctionT, Protocol>(
std::forward<ExecutorType>(executor),
host,
std::to_string(port),
Expand Down
4 changes: 3 additions & 1 deletion src/roar/client.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,9 @@ namespace Roar
onResolve)
{
resolver_.async_resolve(
boost::asio::ip::tcp::resolver::query{host, port, boost::asio::ip::resolver_query_base::numeric_service},
host,
port,
boost::asio::ip::resolver_query_base::numeric_service,
[onResolve = std::move(onResolve)](boost::beast::error_code ec, auto results) mutable {
onResolve(ec, std::move(results));
});
Expand Down
Loading