From e2981c340b840cc4ffc0cf5fe9a8d78701bd8e83 Mon Sep 17 00:00:00 2001 From: eidheim Date: Mon, 12 Jun 2017 10:53:22 +0200 Subject: [PATCH] Cleanup of Client in preparation for async request --- client_http.hpp | 68 ++++++++++++++++++++---------------------------- client_https.hpp | 38 +++++++++++---------------- 2 files changed, 43 insertions(+), 63 deletions(-) diff --git a/client_http.hpp b/client_http.hpp index 7b27c82..f6c2732 100644 --- a/client_http.hpp +++ b/client_http.hpp @@ -142,19 +142,17 @@ namespace SimpleWeb { } void close() { - std::lock_guard lock(socket_mutex); - if(socket) { - error_code ec; - socket->lowest_layer().shutdown(asio::ip::tcp::socket::shutdown_both, ec); - socket->lowest_layer().close(); - } + error_code ec; + socket->lowest_layer().shutdown(asio::ip::tcp::socket::shutdown_both, ec); + socket->lowest_layer().close(ec); + socket_closed=true; } protected: std::shared_ptr io_service; std::unique_ptr socket; - std::mutex socket_mutex; + bool socket_closed=true; //temporary fix std::string host; unsigned short port; @@ -247,8 +245,7 @@ namespace SimpleWeb { if(timer) timer->cancel(); if(ec) { - std::lock_guard lock(socket_mutex); - socket=nullptr; + close(); throw system_error(ec); } }); @@ -257,11 +254,11 @@ namespace SimpleWeb { std::shared_ptr request_read() { std::shared_ptr response(new Response()); - asio::streambuf chunked_streambuf; + auto chunked_streambuf=std::make_shared(); auto timer=get_timeout_timer(); asio::async_read_until(*socket, response->content_buffer, "\r\n\r\n", - [this, &response, &chunked_streambuf, timer](const error_code& ec, size_t bytes_transferred) { + [this, response, chunked_streambuf, timer](const error_code& ec, size_t bytes_transferred) { if(timer) timer->cancel(); if(!ec) { @@ -275,12 +272,11 @@ namespace SimpleWeb { if(content_length>num_additional_bytes) { auto timer=get_timeout_timer(); asio::async_read(*socket, response->content_buffer, asio::transfer_exactly(content_length-num_additional_bytes), - [this, timer](const error_code& ec, size_t /*bytes_transferred*/) { + [this, response, timer](const error_code& ec, size_t /*bytes_transferred*/) { if(timer) timer->cancel(); if(ec) { - std::lock_guard lock(socket_mutex); - this->socket=nullptr; + close(); throw system_error(ec); } }); @@ -291,12 +287,11 @@ namespace SimpleWeb { } else if(response->http_version<"1.1" || ((header_it=response->header.find("Connection"))!=response->header.end() && header_it->second=="close")) { auto timer=get_timeout_timer(); - asio::async_read(*socket, response->content_buffer, [this, timer](const error_code& ec, size_t /*bytes_transferred*/) { + asio::async_read(*socket, response->content_buffer, [this, response, timer](const error_code& ec, size_t /*bytes_transferred*/) { if(timer) timer->cancel(); if(ec) { - std::lock_guard lock(socket_mutex); - this->socket=nullptr; + close(); if(ec!=asio::error::eof) throw system_error(ec); } @@ -304,8 +299,7 @@ namespace SimpleWeb { } } else { - std::lock_guard lock(socket_mutex); - socket=nullptr; + close(); throw system_error(ec); } }); @@ -315,9 +309,9 @@ namespace SimpleWeb { return response; } - void request_read_chunked(const std::shared_ptr &response, asio::streambuf &streambuf) { + void request_read_chunked(const std::shared_ptr &response, const std::shared_ptr &streambuf) { auto timer=get_timeout_timer(); - asio::async_read_until(*socket, response->content_buffer, "\r\n", [this, &response, &streambuf, timer](const error_code& ec, size_t bytes_transferred) { + asio::async_read_until(*socket, response->content_buffer, "\r\n", [this, response, streambuf, timer](const error_code& ec, size_t bytes_transferred) { if(timer) timer->cancel(); if(!ec) { @@ -329,8 +323,8 @@ namespace SimpleWeb { auto num_additional_bytes=static_cast(response->content_buffer.size()-bytes_transferred); - auto post_process=[this, &response, &streambuf, length] { - std::ostream stream(&streambuf); + auto post_process=[this, response, streambuf, length] { + std::ostream stream(streambuf.get()); if(length>0) { std::vector buffer(static_cast(length)); response->content.read(&buffer[0], length); @@ -352,15 +346,14 @@ namespace SimpleWeb { if((2+length)>num_additional_bytes) { auto timer=get_timeout_timer(); asio::async_read(*socket, response->content_buffer, asio::transfer_exactly(2+length-num_additional_bytes), - [this, post_process, timer](const error_code& ec, size_t /*bytes_transferred*/) { + [this, response, post_process, timer](const error_code& ec, size_t /*bytes_transferred*/) { if(timer) timer->cancel(); if(!ec) { post_process(); } else { - std::lock_guard lock(socket_mutex); - this->socket=nullptr; + close(); throw system_error(ec); } }); @@ -369,8 +362,7 @@ namespace SimpleWeb { post_process(); } else { - std::lock_guard lock(socket_mutex); - socket=nullptr; + close(); throw system_error(ec); } }); @@ -385,11 +377,13 @@ namespace SimpleWeb { template<> class Client : public ClientBase { public: - Client(const std::string& server_port_path) : ClientBase::ClientBase(server_port_path, 80) {} + Client(const std::string& server_port_path) : ClientBase::ClientBase(server_port_path, 80) { + socket=std::unique_ptr(new HTTP(*io_service)); + } protected: void connect() { - if(!socket || !socket->is_open()) { + if(socket_closed) { std::unique_ptr query; if(config.proxy_server.empty()) query=std::unique_ptr(new asio::ip::tcp::resolver::query(host, std::to_string(port))); @@ -401,29 +395,23 @@ namespace SimpleWeb { auto resolver=std::make_shared(*io_service); resolver->async_resolve(*query, [this, resolver](const error_code &ec, asio::ip::tcp::resolver::iterator it){ if(!ec) { - { - std::lock_guard lock(socket_mutex); - socket=std::unique_ptr(new HTTP(*io_service)); - } - auto timer=get_timeout_timer(config.timeout_connect); - asio::async_connect(*socket, it, [this, timer](const error_code &ec, asio::ip::tcp::resolver::iterator /*it*/){ + asio::async_connect(*socket, it, [this, resolver, timer](const error_code &ec, asio::ip::tcp::resolver::iterator /*it*/){ if(timer) timer->cancel(); if(!ec) { asio::ip::tcp::no_delay option(true); this->socket->set_option(option); + socket_closed=false; } else { - std::lock_guard lock(socket_mutex); - this->socket=nullptr; + close(); throw system_error(ec); } }); } else { - std::lock_guard lock(socket_mutex); - socket=nullptr; + close(); throw system_error(ec); } }); diff --git a/client_https.hpp b/client_https.hpp index 01ebde8..262e6ab 100644 --- a/client_https.hpp +++ b/client_https.hpp @@ -36,13 +36,15 @@ namespace SimpleWeb { context.set_verify_mode(asio::ssl::verify_peer); else context.set_verify_mode(asio::ssl::verify_none); + + socket=std::unique_ptr(new HTTPS(*io_service, context)); } protected: asio::ssl::context context; void connect() { - if(!socket || !socket->lowest_layer().is_open()) { + if(socket_closed) { std::unique_ptr query; if(config.proxy_server.empty()) query=std::unique_ptr(new asio::ip::tcp::resolver::query(host, std::to_string(port))); @@ -53,29 +55,23 @@ namespace SimpleWeb { auto resolver=std::make_shared(*io_service); resolver->async_resolve(*query, [this, resolver] (const error_code &ec, asio::ip::tcp::resolver::iterator it){ if(!ec) { - { - std::lock_guard lock(socket_mutex); - socket=std::unique_ptr(new HTTPS(*io_service, context)); - } - auto timer=get_timeout_timer(config.timeout_connect); - asio::async_connect(socket->lowest_layer(), it, [this, timer] (const error_code &ec, asio::ip::tcp::resolver::iterator /*it*/){ + asio::async_connect(socket->lowest_layer(), it, [this, resolver, timer] (const error_code &ec, asio::ip::tcp::resolver::iterator /*it*/){ if(timer) timer->cancel(); if(!ec) { asio::ip::tcp::no_delay option(true); this->socket->lowest_layer().set_option(option); + socket_closed=false; } else { - std::lock_guard lock(socket_mutex); - this->socket=nullptr; + close(); throw system_error(ec); } }); } else { - std::lock_guard lock(socket_mutex); - socket=nullptr; + close(); throw system_error(ec); } }); @@ -83,17 +79,16 @@ namespace SimpleWeb { io_service->run(); if(!config.proxy_server.empty()) { - asio::streambuf write_buffer; - std::ostream write_stream(&write_buffer); + auto write_buffer=std::make_shared(); + std::ostream write_stream(write_buffer.get()); auto host_port=host+':'+std::to_string(port); write_stream << "CONNECT "+host_port+" HTTP/1.1\r\n" << "Host: " << host_port << "\r\n\r\n"; auto timer=get_timeout_timer(); - asio::async_write(socket->next_layer(), write_buffer, [this, timer](const error_code &ec, size_t /*bytes_transferred*/) { + asio::async_write(socket->next_layer(), *write_buffer, [this, write_buffer, timer](const error_code &ec, size_t /*bytes_transferred*/) { if(timer) timer->cancel(); if(ec) { - std::lock_guard lock(socket_mutex); - socket=nullptr; + close(); throw system_error(ec); } }); @@ -102,12 +97,11 @@ namespace SimpleWeb { std::shared_ptr response(new Response()); timer=get_timeout_timer(); - asio::async_read_until(socket->next_layer(), response->content_buffer, "\r\n\r\n", [this, timer](const error_code& ec, size_t /*bytes_transferred*/) { + asio::async_read_until(socket->next_layer(), response->content_buffer, "\r\n\r\n", [this, response, timer](const error_code& ec, size_t /*bytes_transferred*/) { if(timer) timer->cancel(); if(ec) { - std::lock_guard lock(socket_mutex); - socket=nullptr; + close(); throw system_error(ec); } }); @@ -115,8 +109,7 @@ namespace SimpleWeb { io_service->run(); parse_response_header(response); if (response->status_code.empty() || response->status_code.compare(0, 3, "200") != 0) { - std::lock_guard lock(socket_mutex); - socket=nullptr; + close(); throw make_error_code::make_error_code(errc::permission_denied); } } @@ -126,8 +119,7 @@ namespace SimpleWeb { if(timer) timer->cancel(); if(ec) { - std::lock_guard lock(socket_mutex); - socket=nullptr; + close(); throw system_error(ec); } });