merged RC_1_1 into master

Author: arvidn

ChangeLog

@@ -81,6 +81,7 @@
 	* resume data no longer has timestamps of files
 	* require C++11 to build libtorrent
 
+	* fix support for boost-1.66 (requires C++11)
 	* fix i2p support
 	* fix loading resume data when in seed mode
 	* fix part-file creation race condition

include/libtorrent/proxy_base.hpp

@@ -63,6 +63,11 @@ class proxy_base
 		m_port = port;
 	}
 
+#if BOOST_VERSION >= 106600
+	typedef tcp::socket::executor_type executor_type;
+	executor_type get_executor() { return m_sock.get_executor(); }
+#endif
+
 	template <class Mutable_Buffers, class Handler>
 	void async_read_some(Mutable_Buffers const& buffers, Handler const& handler)
 	{
@@ -119,6 +124,18 @@ class proxy_base
 		m_sock.async_write_some(buffers, handler);
 	}
 
+#ifndef BOOST_NO_EXCEPTIONS
+	void non_blocking(bool b)
+	{
+		m_sock.non_blocking(b);
+	}
+#endif
+
+	error_code non_blocking(bool b, error_code& ec)
+	{
+		return m_sock.non_blocking(b, ec);
+	}
+
 #ifndef BOOST_NO_EXCEPTIONS
 	template <class SettableSocketOption>
 	void set_option(SettableSocketOption const& opt)

include/libtorrent/socket_type.hpp

@@ -258,6 +258,14 @@ namespace libtorrent {
 		error_code set_option(SettableSocketOption const& opt, error_code& ec)
 		{ TORRENT_SOCKTYPE_FORWARD_RET(set_option(opt, ec), ec) }
 
+		void non_blocking(bool b, error_code& ec)
+		{ TORRENT_SOCKTYPE_FORWARD(non_blocking(b, ec)) }
+
+#ifndef BOOST_NO_EXCEPTIONS
+		void non_blocking(bool b)
+		{ TORRENT_SOCKTYPE_FORWARD(non_blocking(b)) }
+#endif
+
 #ifndef BOOST_NO_EXCEPTIONS
 		template <class GettableSocketOption>
 		void get_option(GettableSocketOption& opt)

include/libtorrent/ssl_stream.hpp

@@ -79,6 +79,10 @@ class ssl_stream
 	typedef typename Stream::lowest_layer_type lowest_layer_type;
 	typedef typename Stream::endpoint_type endpoint_type;
 	typedef typename Stream::protocol_type protocol_type;
+#if BOOST_VERSION >= 106600
+	typedef typename sock_type::executor_type executor_type;
+	executor_type get_executor() { return m_sock.get_executor(); }
+#endif
 
 	void set_host_name(std::string name)
 	{
@@ -198,6 +202,13 @@ class ssl_stream
 		m_sock.next_layer().io_control(ioc, ec);
 	}
 
+#ifndef BOOST_NO_EXCEPTIONS
+	void non_blocking(bool b) { m_sock.next_layer().non_blocking(b); }
+#endif
+
+	error_code non_blocking(bool b, error_code& ec)
+	{ return m_sock.next_layer().non_blocking(b, ec); }
+
 	template <class Const_Buffers, class Handler>
 	void async_write_some(Const_Buffers const& buffers, Handler const& handler)
 	{

include/libtorrent/utp_stream.hpp

@@ -187,6 +187,11 @@ struct TORRENT_EXTRA_EXPORT utp_stream
 	using endpoint_type = tcp::socket::endpoint_type;
 	using protocol_type = tcp::socket::protocol_type;
 
+#if BOOST_VERSION >= 106600
+	typedef tcp::socket::executor_type executor_type;
+	executor_type get_executor() { return m_io_service.get_executor(); }
+#endif
+
 	explicit utp_stream(io_service& io_service);
 	~utp_stream();
 	utp_stream& operator=(utp_stream const&) = delete;
@@ -208,6 +213,12 @@ struct TORRENT_EXTRA_EXPORT utp_stream
 	template <class IO_Control_Command>
 	void io_control(IO_Control_Command&, error_code&) {}
 
+#ifndef BOOST_NO_EXCEPTIONS
+	void non_blocking(bool) {}
+#endif
+
+	error_code non_blocking(bool, error_code&) { return error_code(); }
+
 #ifndef BOOST_NO_EXCEPTIONS
 	void bind(endpoint_type const& /*endpoint*/) {}
 #endif
@@ -320,8 +331,13 @@ struct TORRENT_EXTRA_EXPORT utp_stream
 			return;
 		}
 		std::size_t bytes_added = 0;
+#if BOOST_VERSION >= 106600
+		for (auto i = buffer_sequence_begin(buffers)
+			, end(buffer_sequence_end(buffers)); i != end; ++i)
+#else
 		for (typename Mutable_Buffers::const_iterator i = buffers.begin()
 			, end(buffers.end()); i != end; ++i)
+#endif
 		{
 			if (buffer_size(*i) == 0) continue;
 			using boost::asio::buffer_cast;
@@ -391,8 +407,13 @@ struct TORRENT_EXTRA_EXPORT utp_stream
 		size_t buf_size = 0;
 #endif
 
+#if BOOST_VERSION >= 106600
+		for (auto i = buffer_sequence_begin(buffers)
+			, end(buffer_sequence_end(buffers)); i != end; ++i)
+#else
 		for (typename Mutable_Buffers::const_iterator i = buffers.begin()
 			, end(buffers.end()); i != end; ++i)
+#endif
 		{
 			using boost::asio::buffer_cast;
 			using boost::asio::buffer_size;
@@ -456,8 +477,13 @@ struct TORRENT_EXTRA_EXPORT utp_stream
 		}
 
 		std::size_t bytes_added = 0;
+#if BOOST_VERSION >= 106600
+		for (auto i = buffer_sequence_begin(buffers)
+			, end(buffer_sequence_end(buffers)); i != end; ++i)
+#else
 		for (typename Const_Buffers::const_iterator i = buffers.begin()
 			, end(buffers.end()); i != end; ++i)
+#endif
 		{
 			if (buffer_size(*i) == 0) continue;
 			using boost::asio::buffer_cast;

simulation/fake_peer.hpp

@@ -290,7 +290,7 @@ struct udp_server
 		m_socket.bind(asio::ip::udp::endpoint(asio::ip::address_v4::any(), port), ec);
 		TEST_CHECK(!ec);
 
-		m_socket.io_control(lt::udp::socket::non_blocking_io(true));
+		m_socket.non_blocking(true);
 
 		std::printf("udp_server::async_read_some\n");
 		using namespace std::placeholders;

simulation/libsimulator

@@ -109,8 +109,7 @@ struct dht_node final : lt::dht::socket_manager
 		sock().bind(asio::ip::udp::endpoint(
 			m_ipv6 ? lt::address(lt::address_v6::any()) : lt::address(lt::address_v4::any()), 6881));
 
-		udp::socket::non_blocking_io ioc(true);
-		sock().io_control(ioc);
+		sock().non_blocking(true);
 		sock().async_receive_from(asio::mutable_buffers_1(m_buffer, sizeof(m_buffer))
 			, m_ep, [&](lt::error_code const& ec, std::size_t bytes_transferred)
 				{ this->on_read(ec, bytes_transferred); });

simulation/setup_dht.cpp

@@ -145,7 +145,7 @@ TORRENT_TEST(dht_rate_limit)
 	udp::socket sender_sock(sender_ios);
 	sender_sock.open(udp::v4());
 	sender_sock.bind(udp::endpoint(address_v4(), 4444));
-	sender_sock.io_control(udp::socket::non_blocking_io(true));
+	sender_sock.non_blocking(true);
 	asio::high_resolution_timer timer(sender_ios);
 	std::function<void(error_code const&)> sender_tick = [&](error_code const&)
 	{

simulation/test_dht_rate_limit.cpp

@@ -326,8 +326,7 @@ void http_connection::start(std::string const& hostname, int port
 		{
 			if (m_ssl_ctx == nullptr)
 			{
-				m_ssl_ctx = new (std::nothrow) ssl::context(
-					m_timer.get_io_service(), ssl::context::sslv23_client);
+				m_ssl_ctx = new (std::nothrow) ssl::context(ssl::context::sslv23_client);
 				if (m_ssl_ctx)
 				{
 					m_own_ssl_context = true;

src/http_connection.cpp

@@ -267,9 +267,8 @@ namespace libtorrent {
 
 		if (!m_outgoing)
 		{
-			tcp::socket::non_blocking_io ioc(true);
 			error_code ec;
-			m_socket->io_control(ioc, ec);
+			m_socket->non_blocking(true, ec);
 			if (ec)
 			{
 				disconnect(ec, operation_t::iocontrol);
@@ -6059,11 +6058,10 @@ namespace libtorrent {
 
 		// set the socket to non-blocking, so that we can
 		// read the entire buffer on each read event we get
-		tcp::socket::non_blocking_io ioc(true);
 #ifndef TORRENT_DISABLE_LOGGING
 		peer_log(peer_log_alert::info, "SET_NON_BLOCKING");
 #endif
-		m_socket->io_control(ioc, ec);
+		m_socket->non_blocking(true, ec);
 		if (ec)
 		{
 			disconnect(ec, operation_t::iocontrol);

src/peer_connection.cpp

@@ -395,7 +395,7 @@ namespace aux {
 		: m_settings(pack)
 		, m_io_service(ios)
 #ifdef TORRENT_USE_OPENSSL
-		, m_ssl_ctx(m_io_service, boost::asio::ssl::context::sslv23)
+		, m_ssl_ctx(boost::asio::ssl::context::sslv23)
 #endif
 		, m_alerts(m_settings.get_int(settings_pack::alert_queue_size)
 			, alert_category_t{static_cast<unsigned int>(m_settings.get_int(settings_pack::alert_mask))})

src/session_impl.cpp

@@ -1544,7 +1544,7 @@ namespace libtorrent {
 		// create the SSL context for this torrent. We need to
 		// inject the root certificate, and no other, to
 		// verify other peers against
-		std::shared_ptr<context> ctx = std::make_shared<context>(m_ses.get_io_service(), context::sslv23);
+		std::shared_ptr<context> ctx = std::make_shared<context>(context::sslv23);
 
 		if (!ctx)
 		{
@@ -1581,7 +1581,7 @@ namespace libtorrent {
 			return;
 		}
 
-		SSL_CTX* ssl_ctx = ctx->impl();
+		SSL_CTX* ssl_ctx = ctx->native_handle();
 		// create a new x.509 certificate store
 		X509_STORE* cert_store = X509_STORE_new();
 		if (!cert_store)

src/torrent.cpp

@@ -447,8 +447,7 @@ void udp_socket::bind(udp::endpoint const& ep, error_code& ec)
 	if (ec) return;
 	m_socket.bind(ep, ec);
 	if (ec) return;
-	udp::socket::non_blocking_io ioc(true);
-	m_socket.io_control(ioc, ec);
+	m_socket.non_blocking(true, ec);
 	if (ec) return;
 
 	error_code err;

src/udp_socket.cpp

@@ -369,7 +369,7 @@ bool try_connect(lt::session& ses1, int port
 	// create the SSL context for this torrent. We need to
 	// inject the root certificate, and no other, to
 	// verify other peers against
-	context ctx(ios, context::sslv23);
+	context ctx(context::sslv23);
 
 	ctx.set_options(context::default_workarounds
 		| boost::asio::ssl::context::no_sslv2