Merge pull request #23 from mrozigor/connection-improvements

Connection improvements
CrowCpp · Oct 21, 2020 · 993530d · 993530d
2 parents 79068ba + 179114b
commit 993530d
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 0 deletions.
diff --git a/include/crow/app.h b/include/crow/app.h
@@ -159,6 +159,7 @@ namespace crow
         {
             use_ssl_ = true;
             ssl_context_.set_verify_mode(boost::asio::ssl::verify_peer);
+            ssl_context_.set_verify_mode(boost::asio::ssl::verify_client_once);
             ssl_context_.use_certificate_file(crt_filename, ssl_context_t::pem);
             ssl_context_.use_private_key_file(key_filename, ssl_context_t::pem);
             ssl_context_.set_options(
@@ -173,6 +174,7 @@ namespace crow
         {
             use_ssl_ = true;
             ssl_context_.set_verify_mode(boost::asio::ssl::verify_peer);
+            ssl_context_.set_verify_mode(boost::asio::ssl::verify_client_once);
             ssl_context_.load_verify_file(pem_filename);
             ssl_context_.set_options(
                     boost::asio::ssl::context::default_workarounds

diff --git a/include/crow/http_connection.h b/include/crow/http_connection.h
@@ -518,6 +518,7 @@ namespace crow
                     {
                         cancel_deadline_timer();
                         parser_.done();
+                        adaptor_.shutdown_read();
                         adaptor_.close();
                         is_reading = false;
                         CROW_LOG_DEBUG << this << " from read(1)";
@@ -558,6 +559,7 @@ namespace crow
                     {
                         if (close_connection_)
                         {
+                            adaptor_.shutdown_write();
                             adaptor_.close();
                             CROW_LOG_DEBUG << this << " from write(1)";
                             check_destroy();
@@ -597,6 +599,7 @@ namespace crow
                 {
                     return;
                 }
+                adaptor_.shutdown_readwrite();
                 adaptor_.close();
             });
             CROW_LOG_DEBUG << this << " timer added: " << timer_cancel_key_.first << ' ' << timer_cancel_key_.second;

diff --git a/include/crow/socket_adaptors.h b/include/crow/socket_adaptors.h
@@ -53,6 +53,24 @@ namespace crow
             socket_.close(ec);
         }
 
+        void shutdown_readwrite()
+        {
+            boost::system::error_code ec;
+            socket_.shutdown(boost::asio::socket_base::shutdown_type::shutdown_both, ec);
+        }
+
+        void shutdown_write()
+        {
+            boost::system::error_code ec;
+            socket_.shutdown(boost::asio::socket_base::shutdown_type::shutdown_send, ec);
+        }
+
+        void shutdown_read()
+        {
+            boost::system::error_code ec;
+            socket_.shutdown(boost::asio::socket_base::shutdown_type::shutdown_receive, ec);
+        }
+
         template <typename F> 
         void start(F f)
         {
@@ -99,6 +117,24 @@ namespace crow
             raw_socket().close(ec);
         }
 
+        void shutdown_readwrite()
+        {
+            boost::system::error_code ec;
+            raw_socket().shutdown(boost::asio::socket_base::shutdown_type::shutdown_both, ec);
+        }
+
+        void shutdown_write()
+        {
+            boost::system::error_code ec;
+            raw_socket().shutdown(boost::asio::socket_base::shutdown_type::shutdown_send, ec);
+        }
+
+        void shutdown_read()
+        {
+            boost::system::error_code ec;
+            raw_socket().shutdown(boost::asio::socket_base::shutdown_type::shutdown_receive, ec);
+        }
+
         boost::asio::io_service& get_io_service()
         {
             return GET_IO_SERVICE(raw_socket());