summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/asio/include/asio/impl/connect.hpp
diff options
context:
space:
mode:
Diffstat (limited to '3rdparty/asio/include/asio/impl/connect.hpp')
-rw-r--r--3rdparty/asio/include/asio/impl/connect.hpp758
1 files changed, 429 insertions, 329 deletions
diff --git a/3rdparty/asio/include/asio/impl/connect.hpp b/3rdparty/asio/include/asio/impl/connect.hpp
index 2ab72f6d726..31ec4e165b4 100644
--- a/3rdparty/asio/include/asio/impl/connect.hpp
+++ b/3rdparty/asio/include/asio/impl/connect.hpp
@@ -2,7 +2,7 @@
// impl/connect.hpp
// ~~~~~~~~~~~~~~~~
//
-// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com)
//
// Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -16,13 +16,15 @@
#endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
#include <algorithm>
-#include "asio/associated_allocator.hpp"
-#include "asio/associated_executor.hpp"
+#include "asio/associator.hpp"
+#include "asio/detail/base_from_cancellation_state.hpp"
#include "asio/detail/bind_handler.hpp"
#include "asio/detail/handler_alloc_helpers.hpp"
#include "asio/detail/handler_cont_helpers.hpp"
#include "asio/detail/handler_invoke_helpers.hpp"
+#include "asio/detail/handler_tracking.hpp"
#include "asio/detail/handler_type_requirements.hpp"
+#include "asio/detail/non_const_lvalue.hpp"
#include "asio/detail/throw_error.hpp"
#include "asio/error.hpp"
#include "asio/post.hpp"
@@ -41,14 +43,70 @@ namespace detail
return true;
}
};
+
+ template <typename Protocol, typename Iterator>
+ inline typename Protocol::endpoint deref_connect_result(
+ Iterator iter, asio::error_code& ec)
+ {
+ return ec ? typename Protocol::endpoint() : *iter;
+ }
+
+ template <typename T, typename Iterator>
+ struct legacy_connect_condition_helper : T
+ {
+ typedef char (*fallback_func_type)(...);
+ operator fallback_func_type() const;
+ };
+
+ template <typename R, typename Arg1, typename Arg2, typename Iterator>
+ struct legacy_connect_condition_helper<R (*)(Arg1, Arg2), Iterator>
+ {
+ R operator()(Arg1, Arg2) const;
+ char operator()(...) const;
+ };
+
+ template <typename T, typename Iterator>
+ struct is_legacy_connect_condition
+ {
+ static char asio_connect_condition_check(char);
+ static char (&asio_connect_condition_check(Iterator))[2];
+
+ static const bool value =
+ sizeof(asio_connect_condition_check(
+ (*static_cast<legacy_connect_condition_helper<T, Iterator>*>(0))(
+ *static_cast<const asio::error_code*>(0),
+ *static_cast<const Iterator*>(0)))) != 1;
+ };
+
+ template <typename ConnectCondition, typename Iterator>
+ inline Iterator call_connect_condition(ConnectCondition& connect_condition,
+ const asio::error_code& ec, Iterator next, Iterator end,
+ typename enable_if<is_legacy_connect_condition<
+ ConnectCondition, Iterator>::value>::type* = 0)
+ {
+ if (next != end)
+ return connect_condition(ec, next);
+ return end;
+ }
+
+ template <typename ConnectCondition, typename Iterator>
+ inline Iterator call_connect_condition(ConnectCondition& connect_condition,
+ const asio::error_code& ec, Iterator next, Iterator end,
+ typename enable_if<!is_legacy_connect_condition<
+ ConnectCondition, Iterator>::value>::type* = 0)
+ {
+ for (;next != end; ++next)
+ if (connect_condition(ec, *next))
+ return next;
+ return end;
+ }
}
-template <typename Protocol ASIO_SVC_TPARAM, typename EndpointSequence>
-typename Protocol::endpoint connect(
- basic_socket<Protocol ASIO_SVC_TARG>& s,
+template <typename Protocol, typename Executor, typename EndpointSequence>
+typename Protocol::endpoint connect(basic_socket<Protocol, Executor>& s,
const EndpointSequence& endpoints,
- typename enable_if<is_endpoint_sequence<
- EndpointSequence>::value>::type*)
+ typename constraint<is_endpoint_sequence<
+ EndpointSequence>::value>::type)
{
asio::error_code ec;
typename Protocol::endpoint result = connect(s, endpoints, ec);
@@ -56,23 +114,21 @@ typename Protocol::endpoint connect(
return result;
}
-template <typename Protocol ASIO_SVC_TPARAM, typename EndpointSequence>
-typename Protocol::endpoint connect(
- basic_socket<Protocol ASIO_SVC_TARG>& s,
+template <typename Protocol, typename Executor, typename EndpointSequence>
+typename Protocol::endpoint connect(basic_socket<Protocol, Executor>& s,
const EndpointSequence& endpoints, asio::error_code& ec,
- typename enable_if<is_endpoint_sequence<
- EndpointSequence>::value>::type*)
+ typename constraint<is_endpoint_sequence<
+ EndpointSequence>::value>::type)
{
- typename EndpointSequence::iterator iter = connect(
- s, endpoints.begin(), endpoints.end(),
- detail::default_connect_condition(), ec);
- return ec ? typename Protocol::endpoint() : *iter;
+ return detail::deref_connect_result<Protocol>(
+ connect(s, endpoints.begin(), endpoints.end(),
+ detail::default_connect_condition(), ec), ec);
}
#if !defined(ASIO_NO_DEPRECATED)
-template <typename Protocol ASIO_SVC_TPARAM, typename Iterator>
-Iterator connect(basic_socket<Protocol ASIO_SVC_TARG>& s, Iterator begin,
- typename enable_if<!is_endpoint_sequence<Iterator>::value>::type*)
+template <typename Protocol, typename Executor, typename Iterator>
+Iterator connect(basic_socket<Protocol, Executor>& s, Iterator begin,
+ typename constraint<!is_endpoint_sequence<Iterator>::value>::type)
{
asio::error_code ec;
Iterator result = connect(s, begin, ec);
@@ -80,17 +136,17 @@ Iterator connect(basic_socket<Protocol ASIO_SVC_TARG>& s, Iterator begin,
return result;
}
-template <typename Protocol ASIO_SVC_TPARAM, typename Iterator>
-inline Iterator connect(basic_socket<Protocol ASIO_SVC_TARG>& s,
+template <typename Protocol, typename Executor, typename Iterator>
+inline Iterator connect(basic_socket<Protocol, Executor>& s,
Iterator begin, asio::error_code& ec,
- typename enable_if<!is_endpoint_sequence<Iterator>::value>::type*)
+ typename constraint<!is_endpoint_sequence<Iterator>::value>::type)
{
return connect(s, begin, Iterator(), detail::default_connect_condition(), ec);
}
#endif // !defined(ASIO_NO_DEPRECATED)
-template <typename Protocol ASIO_SVC_TPARAM, typename Iterator>
-Iterator connect(basic_socket<Protocol ASIO_SVC_TARG>& s,
+template <typename Protocol, typename Executor, typename Iterator>
+Iterator connect(basic_socket<Protocol, Executor>& s,
Iterator begin, Iterator end)
{
asio::error_code ec;
@@ -99,20 +155,19 @@ Iterator connect(basic_socket<Protocol ASIO_SVC_TARG>& s,
return result;
}
-template <typename Protocol ASIO_SVC_TPARAM, typename Iterator>
-inline Iterator connect(basic_socket<Protocol ASIO_SVC_TARG>& s,
+template <typename Protocol, typename Executor, typename Iterator>
+inline Iterator connect(basic_socket<Protocol, Executor>& s,
Iterator begin, Iterator end, asio::error_code& ec)
{
return connect(s, begin, end, detail::default_connect_condition(), ec);
}
-template <typename Protocol ASIO_SVC_TPARAM,
+template <typename Protocol, typename Executor,
typename EndpointSequence, typename ConnectCondition>
-typename Protocol::endpoint connect(
- basic_socket<Protocol ASIO_SVC_TARG>& s,
+typename Protocol::endpoint connect(basic_socket<Protocol, Executor>& s,
const EndpointSequence& endpoints, ConnectCondition connect_condition,
- typename enable_if<is_endpoint_sequence<
- EndpointSequence>::value>::type*)
+ typename constraint<is_endpoint_sequence<
+ EndpointSequence>::value>::type)
{
asio::error_code ec;
typename Protocol::endpoint result = connect(
@@ -121,26 +176,25 @@ typename Protocol::endpoint connect(
return result;
}
-template <typename Protocol ASIO_SVC_TPARAM,
+template <typename Protocol, typename Executor,
typename EndpointSequence, typename ConnectCondition>
-typename Protocol::endpoint connect(
- basic_socket<Protocol ASIO_SVC_TARG>& s,
+typename Protocol::endpoint connect(basic_socket<Protocol, Executor>& s,
const EndpointSequence& endpoints, ConnectCondition connect_condition,
asio::error_code& ec,
- typename enable_if<is_endpoint_sequence<
- EndpointSequence>::value>::type*)
+ typename constraint<is_endpoint_sequence<
+ EndpointSequence>::value>::type)
{
- typename EndpointSequence::iterator iter = connect(
- s, endpoints.begin(), endpoints.end(), connect_condition, ec);
- return ec ? typename Protocol::endpoint() : *iter;
+ return detail::deref_connect_result<Protocol>(
+ connect(s, endpoints.begin(), endpoints.end(),
+ connect_condition, ec), ec);
}
#if !defined(ASIO_NO_DEPRECATED)
-template <typename Protocol ASIO_SVC_TPARAM,
+template <typename Protocol, typename Executor,
typename Iterator, typename ConnectCondition>
-Iterator connect(basic_socket<Protocol ASIO_SVC_TARG>& s,
+Iterator connect(basic_socket<Protocol, Executor>& s,
Iterator begin, ConnectCondition connect_condition,
- typename enable_if<!is_endpoint_sequence<Iterator>::value>::type*)
+ typename constraint<!is_endpoint_sequence<Iterator>::value>::type)
{
asio::error_code ec;
Iterator result = connect(s, begin, connect_condition, ec);
@@ -148,21 +202,21 @@ Iterator connect(basic_socket<Protocol ASIO_SVC_TARG>& s,
return result;
}
-template <typename Protocol ASIO_SVC_TPARAM,
+template <typename Protocol, typename Executor,
typename Iterator, typename ConnectCondition>
-inline Iterator connect(basic_socket<Protocol ASIO_SVC_TARG>& s,
+inline Iterator connect(basic_socket<Protocol, Executor>& s,
Iterator begin, ConnectCondition connect_condition,
asio::error_code& ec,
- typename enable_if<!is_endpoint_sequence<Iterator>::value>::type*)
+ typename constraint<!is_endpoint_sequence<Iterator>::value>::type)
{
return connect(s, begin, Iterator(), connect_condition, ec);
}
#endif // !defined(ASIO_NO_DEPRECATED)
-template <typename Protocol ASIO_SVC_TPARAM,
+template <typename Protocol, typename Executor,
typename Iterator, typename ConnectCondition>
-Iterator connect(basic_socket<Protocol ASIO_SVC_TARG>& s,
- Iterator begin, Iterator end, ConnectCondition connect_condition)
+Iterator connect(basic_socket<Protocol, Executor>& s, Iterator begin,
+ Iterator end, ConnectCondition connect_condition)
{
asio::error_code ec;
Iterator result = connect(s, begin, end, connect_condition, ec);
@@ -170,23 +224,26 @@ Iterator connect(basic_socket<Protocol ASIO_SVC_TARG>& s,
return result;
}
-template <typename Protocol ASIO_SVC_TPARAM,
+template <typename Protocol, typename Executor,
typename Iterator, typename ConnectCondition>
-Iterator connect(basic_socket<Protocol ASIO_SVC_TARG>& s,
- Iterator begin, Iterator end, ConnectCondition connect_condition,
+Iterator connect(basic_socket<Protocol, Executor>& s, Iterator begin,
+ Iterator end, ConnectCondition connect_condition,
asio::error_code& ec)
{
ec = asio::error_code();
for (Iterator iter = begin; iter != end; ++iter)
{
- if (connect_condition(ec, iter))
+ iter = (detail::call_connect_condition(connect_condition, ec, iter, end));
+ if (iter != end)
{
s.close(ec);
s.connect(*iter, ec);
if (!ec)
return iter;
}
+ else
+ break;
}
if (!ec)
@@ -208,11 +265,11 @@ namespace detail
{
}
- template <typename Endpoint>
- bool check_condition(const asio::error_code& ec,
- const Endpoint& endpoint)
+ template <typename Iterator>
+ void check_condition(const asio::error_code& ec,
+ Iterator& iter, Iterator& end)
{
- return connect_condition_(ec, endpoint);
+ iter = detail::call_connect_condition(connect_condition_, ec, iter, end);
}
private:
@@ -229,24 +286,26 @@ namespace detail
{
}
- template <typename Endpoint>
- bool check_condition(const asio::error_code&, const Endpoint&)
+ template <typename Iterator>
+ void check_condition(const asio::error_code&, Iterator&, Iterator&)
{
- return true;
}
};
- template <typename Protocol ASIO_SVC_TPARAM,
- typename EndpointSequence, typename ConnectCondition,
- typename RangeConnectHandler>
- class range_connect_op : base_from_connect_condition<ConnectCondition>
+ template <typename Protocol, typename Executor, typename EndpointSequence,
+ typename ConnectCondition, typename RangeConnectHandler>
+ class range_connect_op
+ : public base_from_cancellation_state<RangeConnectHandler>,
+ base_from_connect_condition<ConnectCondition>
{
public:
- range_connect_op(basic_socket<Protocol ASIO_SVC_TARG>& sock,
+ range_connect_op(basic_socket<Protocol, Executor>& sock,
const EndpointSequence& endpoints,
const ConnectCondition& connect_condition,
RangeConnectHandler& handler)
- : base_from_connect_condition<ConnectCondition>(connect_condition),
+ : base_from_cancellation_state<RangeConnectHandler>(
+ handler, enable_partial_cancellation()),
+ base_from_connect_condition<ConnectCondition>(connect_condition),
socket_(sock),
endpoints_(endpoints),
index_(0),
@@ -257,7 +316,8 @@ namespace detail
#if defined(ASIO_HAS_MOVE)
range_connect_op(const range_connect_op& other)
- : base_from_connect_condition<ConnectCondition>(other),
+ : base_from_cancellation_state<RangeConnectHandler>(other),
+ base_from_connect_condition<ConnectCondition>(other),
socket_(other.socket_),
endpoints_(other.endpoints_),
index_(other.index_),
@@ -267,7 +327,10 @@ namespace detail
}
range_connect_op(range_connect_op&& other)
- : base_from_connect_condition<ConnectCondition>(other),
+ : base_from_cancellation_state<RangeConnectHandler>(
+ ASIO_MOVE_CAST(base_from_cancellation_state<
+ RangeConnectHandler>)(other)),
+ base_from_connect_condition<ConnectCondition>(other),
socket_(other.socket_),
endpoints_(other.endpoints_),
index_(other.index_),
@@ -279,22 +342,31 @@ namespace detail
void operator()(asio::error_code ec, int start = 0)
{
- typename EndpointSequence::iterator iter = endpoints_.begin();
+ this->process(ec, start,
+ const_cast<const EndpointSequence&>(endpoints_).begin(),
+ const_cast<const EndpointSequence&>(endpoints_).end());
+ }
+
+ //private:
+ template <typename Iterator>
+ void process(asio::error_code ec,
+ int start, Iterator begin, Iterator end)
+ {
+ Iterator iter = begin;
std::advance(iter, index_);
- typename EndpointSequence::iterator end = endpoints_.end();
switch (start_ = start)
{
case 1:
for (;;)
{
- for (; iter != end; ++iter, ++index_)
- if (this->check_condition(ec, *iter))
- break;
+ this->check_condition(ec, iter, end);
+ index_ = std::distance(begin, iter);
if (iter != end)
{
socket_.close(ec);
+ ASIO_HANDLER_LOCATION((__FILE__, __LINE__, "async_connect"));
socket_.async_connect(*iter,
ASIO_MOVE_CAST(range_connect_op)(*this));
return;
@@ -303,13 +375,14 @@ namespace detail
if (start)
{
ec = asio::error::not_found;
+ ASIO_HANDLER_LOCATION((__FILE__, __LINE__, "async_connect"));
asio::post(socket_.get_executor(),
detail::bind_handler(
ASIO_MOVE_CAST(range_connect_op)(*this), ec));
return;
}
- default:
+ /* fall-through */ default:
if (iter == end)
break;
@@ -323,89 +396,152 @@ namespace detail
if (!ec)
break;
+ if (this->cancelled() != cancellation_type::none)
+ {
+ ec = asio::error::operation_aborted;
+ break;
+ }
+
++iter;
++index_;
}
- handler_(static_cast<const asio::error_code&>(ec),
+ ASIO_MOVE_OR_LVALUE(RangeConnectHandler)(handler_)(
+ static_cast<const asio::error_code&>(ec),
static_cast<const typename Protocol::endpoint&>(
ec || iter == end ? typename Protocol::endpoint() : *iter));
}
}
- //private:
- basic_socket<Protocol ASIO_SVC_TARG>& socket_;
+ basic_socket<Protocol, Executor>& socket_;
EndpointSequence endpoints_;
std::size_t index_;
int start_;
RangeConnectHandler handler_;
};
- template <typename Protocol ASIO_SVC_TPARAM,
- typename EndpointSequence, typename ConnectCondition,
- typename RangeConnectHandler>
- inline void* asio_handler_allocate(std::size_t size,
- range_connect_op<Protocol ASIO_SVC_TARG, EndpointSequence,
+ template <typename Protocol, typename Executor, typename EndpointSequence,
+ typename ConnectCondition, typename RangeConnectHandler>
+ inline asio_handler_allocate_is_deprecated
+ asio_handler_allocate(std::size_t size,
+ range_connect_op<Protocol, Executor, EndpointSequence,
ConnectCondition, RangeConnectHandler>* this_handler)
{
+#if defined(ASIO_NO_DEPRECATED)
+ asio_handler_alloc_helpers::allocate(size, this_handler->handler_);
+ return asio_handler_allocate_is_no_longer_used();
+#else // defined(ASIO_NO_DEPRECATED)
return asio_handler_alloc_helpers::allocate(
size, this_handler->handler_);
+#endif // defined(ASIO_NO_DEPRECATED)
}
- template <typename Protocol ASIO_SVC_TPARAM,
- typename EndpointSequence, typename ConnectCondition,
- typename RangeConnectHandler>
- inline void asio_handler_deallocate(void* pointer, std::size_t size,
- range_connect_op<Protocol ASIO_SVC_TARG, EndpointSequence,
+ template <typename Protocol, typename Executor, typename EndpointSequence,
+ typename ConnectCondition, typename RangeConnectHandler>
+ inline asio_handler_deallocate_is_deprecated
+ asio_handler_deallocate(void* pointer, std::size_t size,
+ range_connect_op<Protocol, Executor, EndpointSequence,
ConnectCondition, RangeConnectHandler>* this_handler)
{
asio_handler_alloc_helpers::deallocate(
pointer, size, this_handler->handler_);
+#if defined(ASIO_NO_DEPRECATED)
+ return asio_handler_deallocate_is_no_longer_used();
+#endif // defined(ASIO_NO_DEPRECATED)
}
- template <typename Protocol ASIO_SVC_TPARAM,
- typename EndpointSequence, typename ConnectCondition,
- typename RangeConnectHandler>
+ template <typename Protocol, typename Executor, typename EndpointSequence,
+ typename ConnectCondition, typename RangeConnectHandler>
inline bool asio_handler_is_continuation(
- range_connect_op<Protocol ASIO_SVC_TARG, EndpointSequence,
+ range_connect_op<Protocol, Executor, EndpointSequence,
ConnectCondition, RangeConnectHandler>* this_handler)
{
return asio_handler_cont_helpers::is_continuation(
this_handler->handler_);
}
- template <typename Function, typename Protocol
- ASIO_SVC_TPARAM, typename EndpointSequence,
- typename ConnectCondition, typename RangeConnectHandler>
- inline void asio_handler_invoke(Function& function,
- range_connect_op<Protocol ASIO_SVC_TARG, EndpointSequence,
+ template <typename Function, typename Executor, typename Protocol,
+ typename EndpointSequence, typename ConnectCondition,
+ typename RangeConnectHandler>
+ inline asio_handler_invoke_is_deprecated
+ asio_handler_invoke(Function& function,
+ range_connect_op<Protocol, Executor, EndpointSequence,
ConnectCondition, RangeConnectHandler>* this_handler)
{
asio_handler_invoke_helpers::invoke(
function, this_handler->handler_);
+#if defined(ASIO_NO_DEPRECATED)
+ return asio_handler_invoke_is_no_longer_used();
+#endif // defined(ASIO_NO_DEPRECATED)
}
- template <typename Function, typename Protocol
- ASIO_SVC_TPARAM, typename EndpointSequence,
- typename ConnectCondition, typename RangeConnectHandler>
- inline void asio_handler_invoke(const Function& function,
- range_connect_op<Protocol ASIO_SVC_TARG, EndpointSequence,
+ template <typename Function, typename Executor, typename Protocol,
+ typename EndpointSequence, typename ConnectCondition,
+ typename RangeConnectHandler>
+ inline asio_handler_invoke_is_deprecated
+ asio_handler_invoke(const Function& function,
+ range_connect_op<Protocol, Executor, EndpointSequence,
ConnectCondition, RangeConnectHandler>* this_handler)
{
asio_handler_invoke_helpers::invoke(
function, this_handler->handler_);
+#if defined(ASIO_NO_DEPRECATED)
+ return asio_handler_invoke_is_no_longer_used();
+#endif // defined(ASIO_NO_DEPRECATED)
}
- template <typename Protocol ASIO_SVC_TPARAM, typename Iterator,
+ template <typename Protocol, typename Executor>
+ class initiate_async_range_connect
+ {
+ public:
+ typedef Executor executor_type;
+
+ explicit initiate_async_range_connect(basic_socket<Protocol, Executor>& s)
+ : socket_(s)
+ {
+ }
+
+ executor_type get_executor() const ASIO_NOEXCEPT
+ {
+ return socket_.get_executor();
+ }
+
+ template <typename RangeConnectHandler,
+ typename EndpointSequence, typename ConnectCondition>
+ void operator()(ASIO_MOVE_ARG(RangeConnectHandler) handler,
+ const EndpointSequence& endpoints,
+ const ConnectCondition& connect_condition) const
+ {
+ // If you get an error on the following line it means that your
+ // handler does not meet the documented type requirements for an
+ // RangeConnectHandler.
+ ASIO_RANGE_CONNECT_HANDLER_CHECK(RangeConnectHandler,
+ handler, typename Protocol::endpoint) type_check;
+
+ non_const_lvalue<RangeConnectHandler> handler2(handler);
+ range_connect_op<Protocol, Executor, EndpointSequence, ConnectCondition,
+ typename decay<RangeConnectHandler>::type>(socket_, endpoints,
+ connect_condition, handler2.value)(asio::error_code(), 1);
+ }
+
+ private:
+ basic_socket<Protocol, Executor>& socket_;
+ };
+
+ template <typename Protocol, typename Executor, typename Iterator,
typename ConnectCondition, typename IteratorConnectHandler>
- class iterator_connect_op : base_from_connect_condition<ConnectCondition>
+ class iterator_connect_op
+ : public base_from_cancellation_state<IteratorConnectHandler>,
+ base_from_connect_condition<ConnectCondition>
{
public:
- iterator_connect_op(basic_socket<Protocol ASIO_SVC_TARG>& sock,
+ iterator_connect_op(basic_socket<Protocol, Executor>& sock,
const Iterator& begin, const Iterator& end,
const ConnectCondition& connect_condition,
IteratorConnectHandler& handler)
- : base_from_connect_condition<ConnectCondition>(connect_condition),
+ : base_from_cancellation_state<IteratorConnectHandler>(
+ handler, enable_partial_cancellation()),
+ base_from_connect_condition<ConnectCondition>(connect_condition),
socket_(sock),
iter_(begin),
end_(end),
@@ -416,7 +552,8 @@ namespace detail
#if defined(ASIO_HAS_MOVE)
iterator_connect_op(const iterator_connect_op& other)
- : base_from_connect_condition<ConnectCondition>(other),
+ : base_from_cancellation_state<IteratorConnectHandler>(other),
+ base_from_connect_condition<ConnectCondition>(other),
socket_(other.socket_),
iter_(other.iter_),
end_(other.end_),
@@ -426,7 +563,10 @@ namespace detail
}
iterator_connect_op(iterator_connect_op&& other)
- : base_from_connect_condition<ConnectCondition>(other),
+ : base_from_cancellation_state<IteratorConnectHandler>(
+ ASIO_MOVE_CAST(base_from_cancellation_state<
+ IteratorConnectHandler>)(other)),
+ base_from_connect_condition<ConnectCondition>(other),
socket_(other.socket_),
iter_(other.iter_),
end_(other.end_),
@@ -443,13 +583,12 @@ namespace detail
case 1:
for (;;)
{
- for (; iter_ != end_; ++iter_)
- if (this->check_condition(ec, *iter_))
- break;
+ this->check_condition(ec, iter_, end_);
if (iter_ != end_)
{
socket_.close(ec);
+ ASIO_HANDLER_LOCATION((__FILE__, __LINE__, "async_connect"));
socket_.async_connect(*iter_,
ASIO_MOVE_CAST(iterator_connect_op)(*this));
return;
@@ -458,13 +597,14 @@ namespace detail
if (start)
{
ec = asio::error::not_found;
+ ASIO_HANDLER_LOCATION((__FILE__, __LINE__, "async_connect"));
asio::post(socket_.get_executor(),
detail::bind_handler(
ASIO_MOVE_CAST(iterator_connect_op)(*this), ec));
return;
}
- default:
+ /* fall-through */ default:
if (iter_ == end_)
break;
@@ -478,323 +618,283 @@ namespace detail
if (!ec)
break;
+ if (this->cancelled() != cancellation_type::none)
+ {
+ ec = asio::error::operation_aborted;
+ break;
+ }
+
++iter_;
}
- handler_(static_cast<const asio::error_code&>(ec),
+ ASIO_MOVE_OR_LVALUE(IteratorConnectHandler)(handler_)(
+ static_cast<const asio::error_code&>(ec),
static_cast<const Iterator&>(iter_));
}
}
//private:
- basic_socket<Protocol ASIO_SVC_TARG>& socket_;
+ basic_socket<Protocol, Executor>& socket_;
Iterator iter_;
Iterator end_;
int start_;
IteratorConnectHandler handler_;
};
- template <typename Protocol ASIO_SVC_TPARAM, typename Iterator,
+ template <typename Protocol, typename Executor, typename Iterator,
typename ConnectCondition, typename IteratorConnectHandler>
- inline void* asio_handler_allocate(std::size_t size,
- iterator_connect_op<Protocol ASIO_SVC_TARG, Iterator,
+ inline asio_handler_allocate_is_deprecated
+ asio_handler_allocate(std::size_t size,
+ iterator_connect_op<Protocol, Executor, Iterator,
ConnectCondition, IteratorConnectHandler>* this_handler)
{
+#if defined(ASIO_NO_DEPRECATED)
+ asio_handler_alloc_helpers::allocate(size, this_handler->handler_);
+ return asio_handler_allocate_is_no_longer_used();
+#else // defined(ASIO_NO_DEPRECATED)
return asio_handler_alloc_helpers::allocate(
size, this_handler->handler_);
+#endif // defined(ASIO_NO_DEPRECATED)
}
- template <typename Protocol ASIO_SVC_TPARAM, typename Iterator,
+ template <typename Protocol, typename Executor, typename Iterator,
typename ConnectCondition, typename IteratorConnectHandler>
- inline void asio_handler_deallocate(void* pointer, std::size_t size,
- iterator_connect_op<Protocol ASIO_SVC_TARG, Iterator,
+ inline asio_handler_deallocate_is_deprecated
+ asio_handler_deallocate(void* pointer, std::size_t size,
+ iterator_connect_op<Protocol, Executor, Iterator,
ConnectCondition, IteratorConnectHandler>* this_handler)
{
asio_handler_alloc_helpers::deallocate(
pointer, size, this_handler->handler_);
+#if defined(ASIO_NO_DEPRECATED)
+ return asio_handler_deallocate_is_no_longer_used();
+#endif // defined(ASIO_NO_DEPRECATED)
}
- template <typename Protocol ASIO_SVC_TPARAM, typename Iterator,
+ template <typename Protocol, typename Executor, typename Iterator,
typename ConnectCondition, typename IteratorConnectHandler>
inline bool asio_handler_is_continuation(
- iterator_connect_op<Protocol ASIO_SVC_TARG, Iterator,
+ iterator_connect_op<Protocol, Executor, Iterator,
ConnectCondition, IteratorConnectHandler>* this_handler)
{
return asio_handler_cont_helpers::is_continuation(
this_handler->handler_);
}
- template <typename Function, typename Protocol
- ASIO_SVC_TPARAM, typename Iterator,
- typename ConnectCondition, typename IteratorConnectHandler>
- inline void asio_handler_invoke(Function& function,
- iterator_connect_op<Protocol ASIO_SVC_TARG, Iterator,
+ template <typename Function, typename Executor, typename Protocol,
+ typename Iterator, typename ConnectCondition,
+ typename IteratorConnectHandler>
+ inline asio_handler_invoke_is_deprecated
+ asio_handler_invoke(Function& function,
+ iterator_connect_op<Protocol, Executor, Iterator,
ConnectCondition, IteratorConnectHandler>* this_handler)
{
asio_handler_invoke_helpers::invoke(
function, this_handler->handler_);
+#if defined(ASIO_NO_DEPRECATED)
+ return asio_handler_invoke_is_no_longer_used();
+#endif // defined(ASIO_NO_DEPRECATED)
}
- template <typename Function, typename Protocol
- ASIO_SVC_TPARAM, typename Iterator,
- typename ConnectCondition, typename IteratorConnectHandler>
- inline void asio_handler_invoke(const Function& function,
- iterator_connect_op<Protocol ASIO_SVC_TARG, Iterator,
+ template <typename Function, typename Executor, typename Protocol,
+ typename Iterator, typename ConnectCondition,
+ typename IteratorConnectHandler>
+ inline asio_handler_invoke_is_deprecated
+ asio_handler_invoke(const Function& function,
+ iterator_connect_op<Protocol, Executor, Iterator,
ConnectCondition, IteratorConnectHandler>* this_handler)
{
asio_handler_invoke_helpers::invoke(
function, this_handler->handler_);
+#if defined(ASIO_NO_DEPRECATED)
+ return asio_handler_invoke_is_no_longer_used();
+#endif // defined(ASIO_NO_DEPRECATED)
}
-} // namespace detail
-#if !defined(GENERATING_DOCUMENTATION)
+ template <typename Protocol, typename Executor>
+ class initiate_async_iterator_connect
+ {
+ public:
+ typedef Executor executor_type;
-template <typename Protocol ASIO_SVC_TPARAM,
- typename EndpointSequence, typename ConnectCondition,
- typename RangeConnectHandler, typename Allocator>
-struct associated_allocator<
- detail::range_connect_op<Protocol ASIO_SVC_TARG,
- EndpointSequence, ConnectCondition, RangeConnectHandler>,
- Allocator>
-{
- typedef typename associated_allocator<
- RangeConnectHandler, Allocator>::type type;
+ explicit initiate_async_iterator_connect(
+ basic_socket<Protocol, Executor>& s)
+ : socket_(s)
+ {
+ }
- static type get(
- const detail::range_connect_op<Protocol ASIO_SVC_TARG,
- EndpointSequence, ConnectCondition, RangeConnectHandler>& h,
- const Allocator& a = Allocator()) ASIO_NOEXCEPT
- {
- return associated_allocator<RangeConnectHandler,
- Allocator>::get(h.handler_, a);
- }
-};
+ executor_type get_executor() const ASIO_NOEXCEPT
+ {
+ return socket_.get_executor();
+ }
-template <typename Protocol ASIO_SVC_TPARAM,
- typename EndpointSequence, typename ConnectCondition,
- typename RangeConnectHandler, typename Executor>
-struct associated_executor<
- detail::range_connect_op<Protocol ASIO_SVC_TARG,
- EndpointSequence, ConnectCondition, RangeConnectHandler>,
- Executor>
-{
- typedef typename associated_executor<
- RangeConnectHandler, Executor>::type type;
+ template <typename IteratorConnectHandler,
+ typename Iterator, typename ConnectCondition>
+ void operator()(ASIO_MOVE_ARG(IteratorConnectHandler) handler,
+ Iterator begin, Iterator end,
+ const ConnectCondition& connect_condition) const
+ {
+ // If you get an error on the following line it means that your
+ // handler does not meet the documented type requirements for an
+ // IteratorConnectHandler.
+ ASIO_ITERATOR_CONNECT_HANDLER_CHECK(
+ IteratorConnectHandler, handler, Iterator) type_check;
+
+ non_const_lvalue<IteratorConnectHandler> handler2(handler);
+ iterator_connect_op<Protocol, Executor, Iterator, ConnectCondition,
+ typename decay<IteratorConnectHandler>::type>(socket_, begin, end,
+ connect_condition, handler2.value)(asio::error_code(), 1);
+ }
- static type get(
- const detail::range_connect_op<Protocol ASIO_SVC_TARG,
- EndpointSequence, ConnectCondition, RangeConnectHandler>& h,
- const Executor& ex = Executor()) ASIO_NOEXCEPT
- {
- return associated_executor<RangeConnectHandler,
- Executor>::get(h.handler_, ex);
- }
-};
+ private:
+ basic_socket<Protocol, Executor>& socket_;
+ };
+} // namespace detail
-template <typename Protocol ASIO_SVC_TPARAM,
- typename Iterator, typename ConnectCondition,
- typename IteratorConnectHandler, typename Allocator>
-struct associated_allocator<
- detail::iterator_connect_op<Protocol ASIO_SVC_TARG, Iterator,
- ConnectCondition, IteratorConnectHandler>,
- Allocator>
-{
- typedef typename associated_allocator<
- IteratorConnectHandler, Allocator>::type type;
+#if !defined(GENERATING_DOCUMENTATION)
- static type get(
- const detail::iterator_connect_op<Protocol ASIO_SVC_TARG,
- Iterator, ConnectCondition, IteratorConnectHandler>& h,
- const Allocator& a = Allocator()) ASIO_NOEXCEPT
+template <template <typename, typename> class Associator,
+ typename Protocol, typename Executor, typename EndpointSequence,
+ typename ConnectCondition, typename RangeConnectHandler,
+ typename DefaultCandidate>
+struct associator<Associator,
+ detail::range_connect_op<Protocol, Executor,
+ EndpointSequence, ConnectCondition, RangeConnectHandler>,
+ DefaultCandidate>
+ : Associator<RangeConnectHandler, DefaultCandidate>
+{
+ static typename Associator<RangeConnectHandler, DefaultCandidate>::type get(
+ const detail::range_connect_op<Protocol, Executor,
+ EndpointSequence, ConnectCondition, RangeConnectHandler>& h,
+ const DefaultCandidate& c = DefaultCandidate()) ASIO_NOEXCEPT
{
- return associated_allocator<IteratorConnectHandler,
- Allocator>::get(h.handler_, a);
+ return Associator<RangeConnectHandler, DefaultCandidate>::get(
+ h.handler_, c);
}
};
-template <typename Protocol ASIO_SVC_TPARAM,
- typename Iterator, typename ConnectCondition,
- typename IteratorConnectHandler, typename Executor>
-struct associated_executor<
- detail::iterator_connect_op<Protocol ASIO_SVC_TARG, Iterator,
- ConnectCondition, IteratorConnectHandler>,
- Executor>
+template <template <typename, typename> class Associator,
+ typename Protocol, typename Executor, typename Iterator,
+ typename ConnectCondition, typename IteratorConnectHandler,
+ typename DefaultCandidate>
+struct associator<Associator,
+ detail::iterator_connect_op<Protocol, Executor,
+ Iterator, ConnectCondition, IteratorConnectHandler>,
+ DefaultCandidate>
+ : Associator<IteratorConnectHandler, DefaultCandidate>
{
- typedef typename associated_executor<
- IteratorConnectHandler, Executor>::type type;
-
- static type get(
- const detail::iterator_connect_op<Protocol ASIO_SVC_TARG,
+ static typename Associator<IteratorConnectHandler, DefaultCandidate>::type
+ get(
+ const detail::iterator_connect_op<Protocol, Executor,
Iterator, ConnectCondition, IteratorConnectHandler>& h,
- const Executor& ex = Executor()) ASIO_NOEXCEPT
+ const DefaultCandidate& c = DefaultCandidate()) ASIO_NOEXCEPT
{
- return associated_executor<IteratorConnectHandler,
- Executor>::get(h.handler_, ex);
+ return Associator<IteratorConnectHandler, DefaultCandidate>::get(
+ h.handler_, c);
}
};
#endif // !defined(GENERATING_DOCUMENTATION)
-template <typename Protocol ASIO_SVC_TPARAM,
- typename EndpointSequence, typename RangeConnectHandler>
-inline ASIO_INITFN_RESULT_TYPE(RangeConnectHandler,
+template <typename Protocol, typename Executor, typename EndpointSequence,
+ ASIO_COMPLETION_TOKEN_FOR(void (asio::error_code,
+ typename Protocol::endpoint)) RangeConnectHandler>
+inline ASIO_INITFN_AUTO_RESULT_TYPE(RangeConnectHandler,
void (asio::error_code, typename Protocol::endpoint))
-async_connect(basic_socket<Protocol ASIO_SVC_TARG>& s,
+async_connect(basic_socket<Protocol, Executor>& s,
const EndpointSequence& endpoints,
ASIO_MOVE_ARG(RangeConnectHandler) handler,
- typename enable_if<is_endpoint_sequence<
- EndpointSequence>::value>::type*)
+ typename constraint<is_endpoint_sequence<
+ EndpointSequence>::value>::type)
{
- // If you get an error on the following line it means that your handler does
- // not meet the documented type requirements for a RangeConnectHandler.
- ASIO_RANGE_CONNECT_HANDLER_CHECK(
- RangeConnectHandler, handler, typename Protocol::endpoint) type_check;
-
- async_completion<RangeConnectHandler,
- void (asio::error_code, typename Protocol::endpoint)>
- init(handler);
-
- detail::range_connect_op<Protocol ASIO_SVC_TARG, EndpointSequence,
- detail::default_connect_condition,
- ASIO_HANDLER_TYPE(RangeConnectHandler,
- void (asio::error_code, typename Protocol::endpoint))>(s,
- endpoints, detail::default_connect_condition(),
- init.completion_handler)(asio::error_code(), 1);
-
- return init.result.get();
+ return async_initiate<RangeConnectHandler,
+ void (asio::error_code, typename Protocol::endpoint)>(
+ detail::initiate_async_range_connect<Protocol, Executor>(s),
+ handler, endpoints, detail::default_connect_condition());
}
#if !defined(ASIO_NO_DEPRECATED)
-template <typename Protocol ASIO_SVC_TPARAM,
- typename Iterator, typename IteratorConnectHandler>
-inline ASIO_INITFN_RESULT_TYPE(IteratorConnectHandler,
+template <typename Protocol, typename Executor, typename Iterator,
+ ASIO_COMPLETION_TOKEN_FOR(void (asio::error_code,
+ Iterator)) IteratorConnectHandler>
+inline ASIO_INITFN_AUTO_RESULT_TYPE(IteratorConnectHandler,
void (asio::error_code, Iterator))
-async_connect(basic_socket<Protocol ASIO_SVC_TARG>& s,
- Iterator begin, ASIO_MOVE_ARG(IteratorConnectHandler) handler,
- typename enable_if<!is_endpoint_sequence<Iterator>::value>::type*)
+async_connect(basic_socket<Protocol, Executor>& s, Iterator begin,
+ ASIO_MOVE_ARG(IteratorConnectHandler) handler,
+ typename constraint<!is_endpoint_sequence<Iterator>::value>::type)
{
- // If you get an error on the following line it means that your handler does
- // not meet the documented type requirements for a IteratorConnectHandler.
- ASIO_ITERATOR_CONNECT_HANDLER_CHECK(
- IteratorConnectHandler, handler, Iterator) type_check;
-
- async_completion<IteratorConnectHandler,
- void (asio::error_code, Iterator)> init(handler);
-
- detail::iterator_connect_op<Protocol ASIO_SVC_TARG, Iterator,
- detail::default_connect_condition, ASIO_HANDLER_TYPE(
- IteratorConnectHandler, void (asio::error_code, Iterator))>(s,
- begin, Iterator(), detail::default_connect_condition(),
- init.completion_handler)(asio::error_code(), 1);
-
- return init.result.get();
+ return async_initiate<IteratorConnectHandler,
+ void (asio::error_code, Iterator)>(
+ detail::initiate_async_iterator_connect<Protocol, Executor>(s),
+ handler, begin, Iterator(), detail::default_connect_condition());
}
#endif // !defined(ASIO_NO_DEPRECATED)
-template <typename Protocol ASIO_SVC_TPARAM,
- typename Iterator, typename IteratorConnectHandler>
-inline ASIO_INITFN_RESULT_TYPE(IteratorConnectHandler,
+template <typename Protocol, typename Executor, typename Iterator,
+ ASIO_COMPLETION_TOKEN_FOR(void (asio::error_code,
+ Iterator)) IteratorConnectHandler>
+inline ASIO_INITFN_AUTO_RESULT_TYPE(IteratorConnectHandler,
void (asio::error_code, Iterator))
-async_connect(basic_socket<Protocol ASIO_SVC_TARG>& s,
- Iterator begin, Iterator end,
+async_connect(basic_socket<Protocol, Executor>& s, Iterator begin, Iterator end,
ASIO_MOVE_ARG(IteratorConnectHandler) handler)
{
- // If you get an error on the following line it means that your handler does
- // not meet the documented type requirements for a IteratorConnectHandler.
- ASIO_ITERATOR_CONNECT_HANDLER_CHECK(
- IteratorConnectHandler, handler, Iterator) type_check;
-
- async_completion<IteratorConnectHandler,
- void (asio::error_code, Iterator)> init(handler);
-
- detail::iterator_connect_op<Protocol ASIO_SVC_TARG, Iterator,
- detail::default_connect_condition, ASIO_HANDLER_TYPE(
- IteratorConnectHandler, void (asio::error_code, Iterator))>(s,
- begin, end, detail::default_connect_condition(),
- init.completion_handler)(asio::error_code(), 1);
-
- return init.result.get();
+ return async_initiate<IteratorConnectHandler,
+ void (asio::error_code, Iterator)>(
+ detail::initiate_async_iterator_connect<Protocol, Executor>(s),
+ handler, begin, end, detail::default_connect_condition());
}
-template <typename Protocol ASIO_SVC_TPARAM, typename EndpointSequence,
- typename ConnectCondition, typename RangeConnectHandler>
-inline ASIO_INITFN_RESULT_TYPE(RangeConnectHandler,
+template <typename Protocol, typename Executor,
+ typename EndpointSequence, typename ConnectCondition,
+ ASIO_COMPLETION_TOKEN_FOR(void (asio::error_code,
+ typename Protocol::endpoint)) RangeConnectHandler>
+inline ASIO_INITFN_AUTO_RESULT_TYPE(RangeConnectHandler,
void (asio::error_code, typename Protocol::endpoint))
-async_connect(basic_socket<Protocol ASIO_SVC_TARG>& s,
+async_connect(basic_socket<Protocol, Executor>& s,
const EndpointSequence& endpoints, ConnectCondition connect_condition,
ASIO_MOVE_ARG(RangeConnectHandler) handler,
- typename enable_if<is_endpoint_sequence<
- EndpointSequence>::value>::type*)
+ typename constraint<is_endpoint_sequence<
+ EndpointSequence>::value>::type)
{
- // If you get an error on the following line it means that your handler does
- // not meet the documented type requirements for a RangeConnectHandler.
- ASIO_RANGE_CONNECT_HANDLER_CHECK(
- RangeConnectHandler, handler, typename Protocol::endpoint) type_check;
-
- async_completion<RangeConnectHandler,
- void (asio::error_code, typename Protocol::endpoint)>
- init(handler);
-
- detail::range_connect_op<Protocol ASIO_SVC_TARG, EndpointSequence,
- ConnectCondition, ASIO_HANDLER_TYPE(RangeConnectHandler,
- void (asio::error_code, typename Protocol::endpoint))>(s,
- endpoints, connect_condition, init.completion_handler)(
- asio::error_code(), 1);
-
- return init.result.get();
+ return async_initiate<RangeConnectHandler,
+ void (asio::error_code, typename Protocol::endpoint)>(
+ detail::initiate_async_range_connect<Protocol, Executor>(s),
+ handler, endpoints, connect_condition);
}
#if !defined(ASIO_NO_DEPRECATED)
-template <typename Protocol ASIO_SVC_TPARAM, typename Iterator,
- typename ConnectCondition, typename IteratorConnectHandler>
-inline ASIO_INITFN_RESULT_TYPE(IteratorConnectHandler,
+template <typename Protocol, typename Executor,
+ typename Iterator, typename ConnectCondition,
+ ASIO_COMPLETION_TOKEN_FOR(void (asio::error_code,
+ Iterator)) IteratorConnectHandler>
+inline ASIO_INITFN_AUTO_RESULT_TYPE(IteratorConnectHandler,
void (asio::error_code, Iterator))
-async_connect(basic_socket<Protocol ASIO_SVC_TARG>& s,
- Iterator begin, ConnectCondition connect_condition,
+async_connect(basic_socket<Protocol, Executor>& s, Iterator begin,
+ ConnectCondition connect_condition,
ASIO_MOVE_ARG(IteratorConnectHandler) handler,
- typename enable_if<!is_endpoint_sequence<Iterator>::value>::type*)
+ typename constraint<!is_endpoint_sequence<Iterator>::value>::type)
{
- // If you get an error on the following line it means that your handler does
- // not meet the documented type requirements for a IteratorConnectHandler.
- ASIO_ITERATOR_CONNECT_HANDLER_CHECK(
- IteratorConnectHandler, handler, Iterator) type_check;
-
- async_completion<IteratorConnectHandler,
- void (asio::error_code, Iterator)> init(handler);
-
- detail::iterator_connect_op<Protocol ASIO_SVC_TARG, Iterator,
- ConnectCondition, ASIO_HANDLER_TYPE(
- IteratorConnectHandler, void (asio::error_code, Iterator))>(s,
- begin, Iterator(), connect_condition, init.completion_handler)(
- asio::error_code(), 1);
-
- return init.result.get();
+ return async_initiate<IteratorConnectHandler,
+ void (asio::error_code, Iterator)>(
+ detail::initiate_async_iterator_connect<Protocol, Executor>(s),
+ handler, begin, Iterator(), connect_condition);
}
#endif // !defined(ASIO_NO_DEPRECATED)
-template <typename Protocol ASIO_SVC_TPARAM, typename Iterator,
- typename ConnectCondition, typename IteratorConnectHandler>
-inline ASIO_INITFN_RESULT_TYPE(IteratorConnectHandler,
+template <typename Protocol, typename Executor,
+ typename Iterator, typename ConnectCondition,
+ ASIO_COMPLETION_TOKEN_FOR(void (asio::error_code,
+ Iterator)) IteratorConnectHandler>
+inline ASIO_INITFN_AUTO_RESULT_TYPE(IteratorConnectHandler,
void (asio::error_code, Iterator))
-async_connect(basic_socket<Protocol ASIO_SVC_TARG>& s,
- Iterator begin, Iterator end, ConnectCondition connect_condition,
+async_connect(basic_socket<Protocol, Executor>& s, Iterator begin,
+ Iterator end, ConnectCondition connect_condition,
ASIO_MOVE_ARG(IteratorConnectHandler) handler)
{
- // If you get an error on the following line it means that your handler does
- // not meet the documented type requirements for a IteratorConnectHandler.
- ASIO_ITERATOR_CONNECT_HANDLER_CHECK(
- IteratorConnectHandler, handler, Iterator) type_check;
-
- async_completion<IteratorConnectHandler,
- void (asio::error_code, Iterator)> init(handler);
-
- detail::iterator_connect_op<Protocol ASIO_SVC_TARG, Iterator,
- ConnectCondition, ASIO_HANDLER_TYPE(
- IteratorConnectHandler, void (asio::error_code, Iterator))>(s,
- begin, end, connect_condition, init.completion_handler)(
- asio::error_code(), 1);
-
- return init.result.get();
+ return async_initiate<IteratorConnectHandler,
+ void (asio::error_code, Iterator)>(
+ detail::initiate_async_iterator_connect<Protocol, Executor>(s),
+ handler, begin, end, connect_condition);
}
} // namespace asio