Update for symbols and API changes

Author: vinniefalco

include/boost/beast2/http_worker.hpp

@@ -47,7 +47,7 @@ namespace beast2 {
         : tcp_server::worker_base
         , http_worker
     {
-        corosio::socket sock;
+        corosio::tcp_socket sock;
 
         my_worker(
             corosio::io_context& ctx,
@@ -63,7 +63,7 @@ namespace beast2 {
             stream = capy::any_read_stream(&sock);
         }
 
-        corosio::socket& socket() override { return sock; }
+        corosio::tcp_socket& socket() override { return sock; }
 
         void run(launcher launch) override
         {

include/boost/beast2/https_server.hpp

@@ -13,7 +13,7 @@
 #include <boost/beast2/detail/config.hpp>
 #include <boost/corosio/tcp_server.hpp>
 #include <boost/corosio/io_context.hpp>
-#include <boost/corosio/tls/context.hpp>
+#include <boost/corosio/tls_context.hpp>
 #include <boost/http/config.hpp>
 #include <cstddef>
 
@@ -38,9 +38,9 @@ namespace beast2 {
     corosio::io_context ctx;
 
     // Configure TLS context for server
-    corosio::tls::context tls_ctx;
-    tls_ctx.use_certificate_chain_file("server.crt", tls::file_format::pem);
-    tls_ctx.use_private_key_file("server.key", tls::file_format::pem);
+    corosio::tls_context tls_ctx;
+    tls_ctx.use_certificate_chain_file("server.crt", corosio::tls_file_format::pem);
+    tls_ctx.use_private_key_file("server.key", corosio::tls_file_format::pem);
 
     http::flat_router router;
     router.add( http::verb::get, "/", my_handler );
@@ -85,7 +85,7 @@ class BOOST_BEAST2_DECL
     https_server(
         corosio::io_context& ctx,
         std::size_t num_workers,
-        corosio::tls::context tls_ctx,
+        corosio::tls_context tls_ctx,
         http::flat_router router,
         http::shared_parser_config parser_cfg,
         http::shared_serializer_config serializer_cfg);

src/http_server.cpp

@@ -50,7 +50,7 @@ struct http_server::
 {
     corosio::io_context& ctx;
     capy::strand<corosio::io_context::executor_type> strand;
-    corosio::socket sock;
+    corosio::tcp_socket sock;
 
     worker(
         corosio::io_context& ctx_,
@@ -70,7 +70,7 @@ struct http_server::
         stream = capy::any_read_stream(&sock);
     }
 
-    corosio::socket& socket() override
+    corosio::tcp_socket& socket() override
     {
         return sock;
     }
@@ -85,7 +85,7 @@ struct http_server::
     {
         co_await do_http_session();
 
-        sock.shutdown(corosio::socket::shutdown_both); // VFALCO too wordy
+        sock.shutdown(corosio::tcp_socket::shutdown_both); // VFALCO too wordy
     }
 };
 

src/https_server.cpp

@@ -16,7 +16,7 @@
 #include <boost/capy/io/any_read_source.hpp>
 #include <boost/capy/io/any_read_stream.hpp>
 #include <boost/capy/io/any_buffer_sink.hpp>
-#include <boost/corosio/tls/openssl_stream.hpp>
+#include <boost/corosio/openssl_stream.hpp>
 #include <boost/http/request_parser.hpp>
 #include <boost/http/response.hpp>
 #include <boost/http/server/router.hpp>
@@ -33,13 +33,13 @@ namespace beast2 {
 
 struct https_server::impl
 {
-    corosio::tls::context tls_ctx;
+    corosio::tls_context tls_ctx;
     http::flat_router router;
     http::shared_parser_config parser_cfg;
     http::shared_serializer_config serializer_cfg;
 
     impl(
-        corosio::tls::context tc,
+        corosio::tls_context tc,
         http::flat_router r)
         : tls_ctx(std::move(tc))
         , router(std::move(r))
@@ -54,8 +54,8 @@ struct https_server::
 {
     corosio::io_context& ctx;
     capy::strand<corosio::io_context::executor_type> strand;
-    corosio::socket sock;
-    corosio::tls::context tls_ctx;
+    corosio::tcp_socket sock;
+    corosio::tls_context tls_ctx;
     std::unique_ptr<corosio::openssl_stream> ssl;
 
     worker(
@@ -73,7 +73,7 @@ struct https_server::
         sock.open();
     }
 
-    corosio::socket& socket() override
+    corosio::tcp_socket& socket() override
     {
         return sock;
     }
@@ -87,14 +87,14 @@ struct https_server::
     do_session()
     {
         // Create TLS stream wrapping the socket
-        ssl = std::make_unique<corosio::openssl_stream>(sock, tls_ctx);
+        ssl = std::make_unique<corosio::openssl_stream>(&sock, tls_ctx);
 
         // Perform TLS handshake as server
         auto [hs_ec] = co_await ssl->handshake(corosio::tls_stream::server);
         if(hs_ec)
         {
             std::cerr << "TLS handshake error: " << hs_ec.message() << "\n";
-            sock.shutdown(corosio::socket::shutdown_both);
+            sock.shutdown(corosio::tcp_socket::shutdown_both);
             ssl.reset();
             co_return;
         }
@@ -117,7 +117,7 @@ struct https_server::
         // Clean up TLS stream before TCP shutdown
         ssl.reset();
 
-        sock.shutdown(corosio::socket::shutdown_both);
+        sock.shutdown(corosio::tcp_socket::shutdown_both);
     }
 };
 
@@ -131,7 +131,7 @@ https_server::
 https_server(
     corosio::io_context& ctx,
     std::size_t num_workers,
-    corosio::tls::context tls_ctx,
+    corosio::tls_context tls_ctx,
     http::flat_router router,
     http::shared_parser_config parser_cfg,
     http::shared_serializer_config serializer_cfg)