diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-11-24 13:01:35 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-11-24 13:01:35 +0200 |
| commit | c36cb5434059ed53daf947b189343ac0bd8f31d8 (patch) | |
| tree | bc2033d9617766983588fc435ea86b522170671d | |
| parent | Merge pull request #1371 (diff) | |
| parent | Fix DNS failures in offline mode preventing daemon startup (diff) | |
| download | monero-c36cb5434059ed53daf947b189343ac0bd8f31d8.tar.xz | |
Merge pull request #1372
17b6bd6 Fix DNS failures in offline mode preventing daemon startup (moneromooo-monero)
| -rw-r--r-- | contrib/epee/include/net/abstract_tcp_server2.inl | 6 | ||||
| -rw-r--r-- | src/p2p/net_node.inl | 2 | ||||
| -rw-r--r-- | src/wallet/api/utils.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/contrib/epee/include/net/abstract_tcp_server2.inl b/contrib/epee/include/net/abstract_tcp_server2.inl index dbdfbc74d..f51ca88bf 100644 --- a/contrib/epee/include/net/abstract_tcp_server2.inl +++ b/contrib/epee/include/net/abstract_tcp_server2.inl @@ -727,7 +727,7 @@ PRAGMA_WARNING_DISABLE_VS(4355) m_address = address; // Open the acceptor with the option to reuse the address (i.e. SO_REUSEADDR). boost::asio::ip::tcp::resolver resolver(io_service_); - boost::asio::ip::tcp::resolver::query query(address, boost::lexical_cast<std::string>(port)); + boost::asio::ip::tcp::resolver::query query(address, boost::lexical_cast<std::string>(port), boost::asio::ip::tcp::resolver::query::canonical_name); boost::asio::ip::tcp::endpoint endpoint = *resolver.resolve(query); acceptor_.open(endpoint.protocol()); acceptor_.set_option(boost::asio::ip::tcp::acceptor::reuse_address(true)); @@ -970,7 +970,7 @@ POP_WARNINGS ////////////////////////////////////////////////////////////////////////// boost::asio::ip::tcp::resolver resolver(io_service_); - boost::asio::ip::tcp::resolver::query query(boost::asio::ip::tcp::v4(), adr, port); + boost::asio::ip::tcp::resolver::query query(boost::asio::ip::tcp::v4(), adr, port, boost::asio::ip::tcp::resolver::query::canonical_name); boost::asio::ip::tcp::resolver::iterator iterator = resolver.resolve(query); boost::asio::ip::tcp::resolver::iterator end; if(iterator == end) @@ -1074,7 +1074,7 @@ POP_WARNINGS ////////////////////////////////////////////////////////////////////////// boost::asio::ip::tcp::resolver resolver(io_service_); - boost::asio::ip::tcp::resolver::query query(boost::asio::ip::tcp::v4(), adr, port); + boost::asio::ip::tcp::resolver::query query(boost::asio::ip::tcp::v4(), adr, port, boost::asio::ip::tcp::resolver::query::canonical_name); boost::asio::ip::tcp::resolver::iterator iterator = resolver.resolve(query); boost::asio::ip::tcp::resolver::iterator end; if(iterator == end) 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()) { |