mirror of
https://github.com/monero-project/monero.git
synced 2024-10-01 11:49:47 -04:00
155475d971
new cli options (RPC ones also apply to wallet):
--p2p-bind-ipv6-address (default = "::")
--p2p-bind-port-ipv6 (default same as ipv4 port for given nettype)
--rpc-bind-ipv6-address (default = "::1")
--p2p-use-ipv6 (default false)
--rpc-use-ipv6 (default false)
--p2p-require-ipv4 (default true, if ipv4 bind fails and this is
true, will not continue even if ipv6 bind
successful)
--rpc-require-ipv4 (default true, description as above)
ipv6 addresses are to be specified as "[xx:xx:xx::xx:xx]:port" except
in the cases of the cli args for bind address. For those the square
braces can be omitted.
84 lines
2.7 KiB
C++
84 lines
2.7 KiB
C++
#include "net/net_helper.h"
|
|
|
|
namespace epee
|
|
{
|
|
namespace net_utils
|
|
{
|
|
boost::unique_future<boost::asio::ip::tcp::socket>
|
|
direct_connect::operator()(const std::string& addr, const std::string& port, boost::asio::steady_timer& timeout) const
|
|
{
|
|
// Get a list of endpoints corresponding to the server name.
|
|
//////////////////////////////////////////////////////////////////////////
|
|
boost::asio::ip::tcp::resolver resolver(GET_IO_SERVICE(timeout));
|
|
boost::asio::ip::tcp::resolver::query query(boost::asio::ip::tcp::v4(), addr, port, boost::asio::ip::tcp::resolver::query::canonical_name);
|
|
|
|
bool try_ipv6 = false;
|
|
boost::asio::ip::tcp::resolver::iterator iterator;
|
|
boost::asio::ip::tcp::resolver::iterator end;
|
|
boost::system::error_code resolve_error;
|
|
try
|
|
{
|
|
iterator = resolver.resolve(query, resolve_error);
|
|
if(iterator == end) // Documentation states that successful call is guaranteed to be non-empty
|
|
{
|
|
// if IPv4 resolution fails, try IPv6. Unintentional outgoing IPv6 connections should only
|
|
// be possible if for some reason a hostname was given and that hostname fails IPv4 resolution,
|
|
// so at least for now there should not be a need for a flag "using ipv6 is ok"
|
|
try_ipv6 = true;
|
|
}
|
|
|
|
}
|
|
catch (const boost::system::system_error& e)
|
|
{
|
|
if (resolve_error != boost::asio::error::host_not_found &&
|
|
resolve_error != boost::asio::error::host_not_found_try_again)
|
|
{
|
|
throw;
|
|
}
|
|
try_ipv6 = true;
|
|
}
|
|
if (try_ipv6)
|
|
{
|
|
boost::asio::ip::tcp::resolver::query query6(boost::asio::ip::tcp::v6(), addr, port, boost::asio::ip::tcp::resolver::query::canonical_name);
|
|
iterator = resolver.resolve(query6);
|
|
if (iterator == end)
|
|
throw boost::system::system_error{boost::asio::error::fault, "Failed to resolve " + addr};
|
|
}
|
|
|
|
//////////////////////////////////////////////////////////////////////////
|
|
|
|
struct new_connection
|
|
{
|
|
boost::promise<boost::asio::ip::tcp::socket> result_;
|
|
boost::asio::ip::tcp::socket socket_;
|
|
|
|
explicit new_connection(boost::asio::io_service& io_service)
|
|
: result_(), socket_(io_service)
|
|
{}
|
|
};
|
|
|
|
const auto shared = std::make_shared<new_connection>(GET_IO_SERVICE(timeout));
|
|
timeout.async_wait([shared] (boost::system::error_code error)
|
|
{
|
|
if (error != boost::system::errc::operation_canceled && shared && shared->socket_.is_open())
|
|
{
|
|
shared->socket_.shutdown(boost::asio::ip::tcp::socket::shutdown_both);
|
|
shared->socket_.close();
|
|
}
|
|
});
|
|
shared->socket_.async_connect(*iterator, [shared] (boost::system::error_code error)
|
|
{
|
|
if (shared)
|
|
{
|
|
if (error)
|
|
shared->result_.set_exception(boost::system::system_error{error});
|
|
else
|
|
shared->result_.set_value(std::move(shared->socket_));
|
|
}
|
|
});
|
|
return shared->result_.get_future();
|
|
}
|
|
}
|
|
}
|
|
|