Mercurial > irccd
changeset 622:c2db630ffd60
Misc: prefix get_ (network_stream)
author | David Demelier <markand@malikania.fr> |
---|---|
date | Fri, 22 Dec 2017 10:26:41 +0100 |
parents | 1afefb4ffcf8 |
children | 4515082ee83f |
files | libcommon/irccd/network_stream.hpp libirccd/irccd/daemon/basic_transport_server.hpp libirccd/irccd/daemon/tls_transport_server.cpp libirccdctl/irccd/ctl/ip_connection.cpp libirccdctl/irccd/ctl/local_connection.cpp |
diffstat | 5 files changed, 13 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/libcommon/irccd/network_stream.hpp Thu Dec 21 22:01:10 2017 +0100 +++ b/libcommon/irccd/network_stream.hpp Fri Dec 22 10:26:41 2017 +0100 @@ -98,7 +98,7 @@ * * \return the socket */ - inline const Socket& socket() const noexcept + inline const Socket& get_socket() const noexcept { return socket_; } @@ -108,7 +108,7 @@ * * \return the socket */ - inline Socket& socket() noexcept + inline Socket& get_socket() noexcept { return socket_; }
--- a/libirccd/irccd/daemon/basic_transport_server.hpp Thu Dec 21 22:01:10 2017 +0100 +++ b/libirccd/irccd/daemon/basic_transport_server.hpp Fri Dec 22 10:26:41 2017 +0100 @@ -84,7 +84,7 @@ { auto client = std::make_shared<basic_transport_client<socket_t>>(*this, acceptor_.get_io_service()); - acceptor_.async_accept(client->stream().socket(), [this, client, handler] (auto code) { + acceptor_.async_accept(client->stream().get_socket(), [this, client, handler] (auto code) { if (code) handler(std::move(code), nullptr); else
--- a/libirccd/irccd/daemon/tls_transport_server.cpp Thu Dec 21 22:01:10 2017 +0100 +++ b/libirccd/irccd/daemon/tls_transport_server.cpp Fri Dec 22 10:26:41 2017 +0100 @@ -24,7 +24,9 @@ void tls_transport_server::do_handshake(std::shared_ptr<client_t> client, accept_t handler) { - client->stream().socket().async_handshake(boost::asio::ssl::stream_base::server, [client, handler] (auto code) { + using boost::asio::ssl::stream_base; + + client->stream().get_socket().async_handshake(stream_base::server, [client, handler] (auto code) { handler(std::move(code), std::move(client)); }); } @@ -39,7 +41,7 @@ { auto client = std::make_shared<client_t>(*this, acceptor_.get_io_service(), context_); - acceptor_.async_accept(client->stream().socket().lowest_layer(), [this, client, handler] (auto code) { + acceptor_.async_accept(client->stream().get_socket().lowest_layer(), [this, client, handler] (auto code) { if (code) handler(std::move(code), nullptr); else
--- a/libirccdctl/irccd/ctl/ip_connection.cpp Thu Dec 21 22:01:10 2017 +0100 +++ b/libirccdctl/irccd/ctl/ip_connection.cpp Fri Dec 22 10:26:41 2017 +0100 @@ -59,21 +59,23 @@ void ip_connection::connect(connect_t handler) { - do_resolve(host_, std::to_string(port_), stream_.socket(), resolver_, std::move(handler)); + do_resolve(host_, std::to_string(port_), stream_.get_socket(), resolver_, std::move(handler)); } #if defined(HAVE_SSL) void tls_connection::handshake(connect_t handler) { - stream_.socket().async_handshake(boost::asio::ssl::stream_base::client, [handler] (auto code) { + stream_.get_socket().async_handshake(boost::asio::ssl::stream_base::client, [handler] (auto code) { handler(code); }); } void tls_connection::connect(connect_t handler) { - do_resolve(host_, std::to_string(port_), stream_.socket().lowest_layer(), resolver_, [handler, this] (auto code) { + const auto port = std::to_string(port_); + + do_resolve(host_, port, stream_.get_socket().lowest_layer(), resolver_, [handler, this] (auto code) { if (code) handler(code); else
--- a/libirccdctl/irccd/ctl/local_connection.cpp Thu Dec 21 22:01:10 2017 +0100 +++ b/libirccdctl/irccd/ctl/local_connection.cpp Fri Dec 22 10:26:41 2017 +0100 @@ -28,7 +28,7 @@ { using endpoint = boost::asio::local::stream_protocol::endpoint; - stream_.socket().async_connect(endpoint(path_), std::move(handler)); + stream_.get_socket().async_connect(endpoint(path_), std::move(handler)); } } // !ctl