UPD | a lot of smart things

Author: xiadnoring

src/http/base_http.cpp

@@ -933,7 +933,7 @@ manapi::future<void> manapi::net::http::internal::send_file(uq_handle_data_t cda
             //         goto err;
             // }
 
-
+            assert(sv.size() == rhs);
             if ((co_await cdata->worker->fwrite (cdata->conn, sv, !readsome)) <= 0)
                 /* failed to send */
                     goto err;

src/worker/OpenSSL_TLS.cpp

@@ -154,11 +154,22 @@ void * manapi::net::worker::OpenSSL_TLS::ssl_create_context(const size_t &versio
     ctx = SSL_CTX_new(method);
 
     if (!ctx)
-    {
         THROW_MANAPIHTTP_EXCEPTION(ERR_INTERNAL, "{}", "cannot create the openssl context for the tcp connection");
-    }
 
-    SSL_CTX_set_options(ctx, SSL_OP_ENABLE_KTLS);
+
+    auto ktls = http::config::get_config_param<bool>(
+        this->config_->ssl, "ktls", true);
+    auto single_dh_use = http::config::get_config_param<bool>(
+        this->config_->ssl, "single_dh_use", false);
+    auto ktls_tx_zerocopy_senfile = http::config::get_config_param<bool>(
+        this->config_->ssl, "ktls_tx_zerocopy_senfile", true);
+
+    if (ktls)
+        SSL_CTX_set_options(ctx, SSL_OP_ENABLE_KTLS);
+    if (ktls_tx_zerocopy_senfile)
+        SSL_CTX_set_options(ctx, SSL_OP_ENABLE_KTLS_TX_ZEROCOPY_SENDFILE);
+
+
     SSL_CTX_set_max_early_data(ctx, 16384);
     SSL_CTX_clear_options(ctx, SSL_OP_NO_COMPRESSION);
     SSL_CTX_set_min_proto_version(ctx, 0);
@@ -170,7 +181,9 @@ void * manapi::net::worker::OpenSSL_TLS::ssl_create_context(const size_t &versio
     //SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2|SSL_OP_NO_TICKET);
     //SSL_CTX_set_session_id_context(ctx, reinterpret_cast<const unsigned char *>(&this->ssl_session_ctx_id), sizeof(this->ssl_session_ctx_id));
 
-    SSL_CTX_set_options(ctx, SSL_OP_SINGLE_DH_USE);
+    if (single_dh_use)
+        SSL_CTX_set_options(ctx, SSL_OP_SINGLE_DH_USE);
+
     SSL_CTX_set_mode(ctx, SSL_MODE_RELEASE_BUFFERS);
 
     if (cipher_list.empty()) {

src/worker/TCP.cpp

@@ -452,7 +452,10 @@ ssize_t manapi::net::worker::TCP::sync_write_ex(const worker::shared_conn &conn,
         rhs = connection->watcher->try_write(buff, nbuff);
 
         if (rhs < 0)
-            rhs = 0;
+            if (errno == EAGAIN || errno == EWOULDBLOCK)
+                rhs = 0;
+            else
+                return -1;
         else
             connection->transfered += rhs;
     }
@@ -477,7 +480,7 @@ ssize_t manapi::net::worker::TCP::sync_write_ex(const worker::shared_conn &conn,
             auto const prev = connection->top->send_size;
             auto const result = connection_io_send (&connection->top->send, static_cast<const char *>(buff[i].base), buff[i].len, &this->bufferpool(),
                 this->config_->buffer_size, &connection->top->send_size, maxcnt);
-            connection->top->cur_send_size += prev - connection->top->send_size;
+            connection->top->cur_send_size += connection->top->send_size - prev;
 
             if (result < 0)
                 return -1;
@@ -601,9 +604,13 @@ int manapi::net::worker::TCP::flush_write_(const worker::shared_conn &connection
         }
         else {
             if (rhs < 0) {
-                conn->top->send_size -= conn->top->cur_send_size;
-                conn->top->cur_send_size = 0;
-                return CONN_IO_ERROR;
+                if (errno == EAGAIN || errno == EWOULDBLOCK)
+                    rhs = 0;
+                else {
+                    conn->top->send_size -= conn->top->cur_send_size;
+                    conn->top->cur_send_size = 0;
+                    return CONN_IO_ERROR;
+                }
             }
 
 
@@ -642,7 +649,7 @@ int manapi::net::worker::TCP::flush_write_(const worker::shared_conn &connection
                                 conn->ev_callback->operator()(connection, ev::DISCONNECT, nullptr, 0, nullptr);
                         }
                         else {
-                            if (conn->status & ev::WRITE)
+                            if (conn->status & ev::WRITE && conn->ev_callback)
                                 conn->ev_callback->operator()(connection, ev::WRITE, nullptr, 0, nullptr);
                         }
 

src/worker/TLS.cpp

@@ -496,9 +496,13 @@ int manapi::net::worker::TLS::ssl_bio_flush_write_(const shared_conn &conn, TLS:
                 if (!m->top->send_size) {
                     alr = m->watcher->try_write(fastfast, rhs);
                     if (alr < 0) {
-                        /* fatal error */
-                        return CONN_IO_ERROR;
+                        if (errno == EAGAIN || errno == EWOULDBLOCK)
+                            /* fatal error */
+                            return CONN_IO_ERROR;
+
+                        alr = 0;
                     }
+
                     if (alr == rhs)
                         continue;
                 }