diff options
Diffstat (limited to 'libcmix-network/connect.cpp')
| -rw-r--r-- | libcmix-network/connect.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/libcmix-network/connect.cpp b/libcmix-network/connect.cpp index 01e72de..9df9b56 100644 --- a/libcmix-network/connect.cpp +++ b/libcmix-network/connect.cpp @@ -4,8 +4,10 @@ #include <boost/asio/ip/basic_resolver.hpp> #include <boost/asio/ip/address.hpp> +#include <boost/asio/ssl.hpp> using namespace boost::asio::ip; +using namespace boost::asio; using boost::asio::io_service; boost::asio::ip::tcp::socket connect(std::string host, std::string port, io_service& io_service) { @@ -50,7 +52,7 @@ struct IterationInfo { {} }; -void async_connect_iteration(tcp::socket& socket, std::shared_ptr<IterationInfo> info, std::function<void()> on_connect) { +void async_connect_iteration(basic_socket<tcp, stream_socket_service<tcp>>& socket, std::shared_ptr<IterationInfo> info, std::function<void()> on_connect) { if(info->it == boost::asio::ip::tcp::resolver::iterator()) { throw std::runtime_error("None of the supplied endpoints responded"); @@ -91,16 +93,16 @@ void async_connect_iteration(tcp::socket& socket, std::shared_ptr<IterationInfo> socket.async_connect(*(info->it), handler); } -void async_connect(tcp::socket& socket, std::string host, std::string next_port, std::function<void()> on_connect) +void async_connect(basic_socket<tcp, stream_socket_service<tcp>>& socket, std::string host, std::string port, std::function<void()> on_connect) { boost::asio::ip::basic_resolver<tcp> resolver(socket.get_io_service()); - boost::asio::ip::basic_resolver_query<tcp> query(host, next_port); + boost::asio::ip::basic_resolver_query<tcp> query(host, port); - BOOST_LOG_TRIVIAL(trace) << "connecting to: \"" << host << ":" << next_port << "\""; + BOOST_LOG_TRIVIAL(trace) << "connecting to: \"" << host << ":" << port << "\""; auto it = resolver.resolve(query); std::shared_ptr<IterationInfo> info = std::make_shared<IterationInfo>(0, it, socket.get_io_service()); - + async_connect_iteration(socket, info, on_connect); -} +}
\ No newline at end of file |