aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2016-11-23 23:08:53 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2016-11-23 23:14:49 +0000
commit17b6bd6d357d66822335ef5c3563e670c23029e3 (patch)
treef03df947752e62ff86367e38aa91bb35875a85fc /src
parentMerge pull request #1346 (diff)
downloadmonero-17b6bd6d357d66822335ef5c3563e670c23029e3.tar.xz
Fix DNS failures in offline mode preventing daemon startup
Diffstat (limited to '')
-rw-r--r--src/p2p/net_node.inl2
-rw-r--r--src/wallet/api/utils.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
index d8dadae1f..b5bfc2979 100644
--- a/src/p2p/net_node.inl
+++ b/src/p2p/net_node.inl
@@ -339,7 +339,7 @@ namespace nodetool
io_service io_srv;
ip::tcp::resolver resolver(io_srv);
- ip::tcp::resolver::query query(host, port);
+ ip::tcp::resolver::query query(host, port, boost::asio::ip::tcp::resolver::query::canonical_name);
boost::system::error_code ec;
ip::tcp::resolver::iterator i = resolver.resolve(query, ec);
CHECK_AND_ASSERT_MES_NO_RET(!ec, "Failed to resolve host name '" << host << "': " << ec.message() << ':' << ec.value());
diff --git a/src/wallet/api/utils.cpp b/src/wallet/api/utils.cpp
index 1bf35197c..7de9d1927 100644
--- a/src/wallet/api/utils.cpp
+++ b/src/wallet/api/utils.cpp
@@ -61,7 +61,7 @@ bool isAddressLocal(const std::string &address)
// resolve to IP
boost::asio::io_service io_service;
boost::asio::ip::tcp::resolver resolver(io_service);
- boost::asio::ip::tcp::resolver::query query(u_c.host, "");
+ boost::asio::ip::tcp::resolver::query query(u_c.host, "", boost::asio::ip::tcp::resolver::query::canonical_name);
boost::asio::ip::tcp::resolver::iterator i = resolver.resolve(query);
while (i != boost::asio::ip::tcp::resolver::iterator())
{