net is a namespace alias for boost::asio:

The namespace alias beast::net replaces boost::asio in all code
and documentation.
This commit is contained in:
Vinnie Falco
2018-11-30 14:58:38 -08:00
parent a5739c3ea0
commit f995fd41a3
185 changed files with 2486 additions and 2392 deletions

View File

@@ -32,29 +32,32 @@
#include <thread>
#include <vector>
using tcp = boost::asio::ip::tcp; // from <boost/asio/ip/tcp.hpp>
namespace ssl = boost::asio::ssl; // from <boost/asio/ssl.hpp>
namespace websocket = boost::beast::websocket; // from <boost/beast/websocket.hpp>
namespace beast = boost::beast; // from <boost/beast.hpp>
namespace http = beast::http; // from <boost/beast/http.hpp>
namespace websocket = beast::websocket; // from <boost/beast/websocket.hpp>
namespace net = boost::asio; // from <boost/asio.hpp>
namespace ssl = boost::asio::ssl; // from <boost/asio/ssl.hpp>
using tcp = boost::asio::ip::tcp; // from <boost/asio/ip/tcp.hpp>
//------------------------------------------------------------------------------
// Report a failure
void
fail(boost::system::error_code ec, char const* what)
fail(beast::error_code ec, char const* what)
{
std::cerr << what << ": " << ec.message() << "\n";
}
// Echoes back all received WebSocket messages
class session
: public boost::asio::coroutine
: public net::coroutine
, public std::enable_shared_from_this<session>
{
tcp::socket socket_;
websocket::stream<ssl::stream<tcp::socket&>> ws_;
boost::asio::strand<
boost::asio::io_context::executor_type> strand_;
boost::beast::multi_buffer buffer_;
net::strand<
net::io_context::executor_type> strand_;
beast::multi_buffer buffer_;
public:
// Take ownership of the socket
@@ -75,7 +78,7 @@ public:
#include <boost/asio/yield.hpp>
void
loop(
boost::system::error_code ec,
beast::error_code ec,
std::size_t bytes_transferred)
{
boost::ignore_unused(bytes_transferred);
@@ -85,7 +88,7 @@ public:
// Perform the SSL handshake
yield ws_.next_layer().async_handshake(
ssl::stream_base::server,
boost::asio::bind_executor(
net::bind_executor(
strand_,
std::bind(
&session::loop,
@@ -97,7 +100,7 @@ public:
// Accept the websocket handshake
yield ws_.async_accept(
boost::asio::bind_executor(
net::bind_executor(
strand_,
std::bind(
&session::loop,
@@ -112,7 +115,7 @@ public:
// Read a message into our buffer
yield ws_.async_read(
buffer_,
boost::asio::bind_executor(
net::bind_executor(
strand_,
std::bind(
&session::loop,
@@ -131,7 +134,7 @@ public:
ws_.text(ws_.got_text());
yield ws_.async_write(
buffer_.data(),
boost::asio::bind_executor(
net::bind_executor(
strand_,
std::bind(
&session::loop,
@@ -153,7 +156,7 @@ public:
// Accepts incoming connections and launches the sessions
class listener
: public boost::asio::coroutine
: public net::coroutine
, public std::enable_shared_from_this<listener>
{
ssl::context& ctx_;
@@ -162,14 +165,14 @@ class listener
public:
listener(
boost::asio::io_context& ioc,
net::io_context& ioc,
ssl::context& ctx,
tcp::endpoint endpoint)
: ctx_(ctx)
, acceptor_(ioc)
, socket_(ioc)
{
boost::system::error_code ec;
beast::error_code ec;
// Open the acceptor
acceptor_.open(endpoint.protocol(), ec);
@@ -180,7 +183,7 @@ public:
}
// Allow address reuse
acceptor_.set_option(boost::asio::socket_base::reuse_address(true), ec);
acceptor_.set_option(net::socket_base::reuse_address(true), ec);
if(ec)
{
fail(ec, "set_option");
@@ -197,7 +200,7 @@ public:
// Start listening for connections
acceptor_.listen(
boost::asio::socket_base::max_listen_connections, ec);
net::socket_base::max_listen_connections, ec);
if(ec)
{
fail(ec, "listen");
@@ -216,7 +219,7 @@ public:
#include <boost/asio/yield.hpp>
void
loop(boost::system::error_code ec = {})
loop(beast::error_code ec = {})
{
reenter(*this)
{
@@ -256,12 +259,12 @@ int main(int argc, char* argv[])
" websocket-server-async-ssl 0.0.0.0 8080 1\n";
return EXIT_FAILURE;
}
auto const address = boost::asio::ip::make_address(argv[1]);
auto const address = net::ip::make_address(argv[1]);
auto const port = static_cast<unsigned short>(std::atoi(argv[2]));
auto const threads = std::max<int>(1, std::atoi(argv[3]));
// The io_context is required for all I/O
boost::asio::io_context ioc{threads};
net::io_context ioc{threads};
// The SSL context is required, and holds certificates
ssl::context ctx{ssl::context::sslv23};