FIX | memory leak

Author: xiadnoring

src/worker/ManapiTcp.cpp

@@ -703,12 +703,13 @@ void manapi::net::worker::TCP::read_stop_(const shared_conn &conn, tcp_connectio
 int manapi::net::worker::TCP::flush_write_(const worker::shared_conn &connection, bool flush) MANAPIHTTP_NOEXCEPT {
     auto conn = connection->as<tcp_connection_t>();
 
+    if (!flush) {
+        flush = (conn->flags & CONN_SEND_END);
+    }
+
     try {
-        if (conn->top && conn->top->cur_send_size) {
-            //std::cout << "flush " << flush << " "<<(bool)conn->top->cur_send_size << " " << (bool)conn->top->send.deque << "\n";
-            while (conn->top->cur_send_size && ((conn->top->cur_send_size >= this->config_->max_merge_buffer_stack)
-                //|| ((conn->top->cur_send_size == this->config_->max_merge_buffer_stack) && (conn->top->send.last_deque->buffer.size() == conn->top->send.deque_cursor))
-                || (flush))) {
+        if (conn->top) {
+            while (conn->top->cur_send_size && ((conn->top->cur_send_size >= this->config_->max_merge_buffer_stack) || (flush))) {
 #ifdef _MSC_VER
                 ev::buff_t *s = static_cast<ev::buff_t*>(alloca(sizeof (ev::buff_t) * conn->top->cur_send_size));
 #else
@@ -818,6 +819,9 @@ int manapi::net::worker::TCP::flush_write_(const worker::shared_conn &connection
                                         return;
                                     }
 
+                                    manapi_log_trace(manapi::debug::LOG_TRACE_LOW, "TCP:packets(%d) were sent %p. now=%d",
+                                        nbuff, connection.get(), conn->top->send_size);
+
                                     if ((conn->flags & (ev::WRITE|ev::DISCONNECT)) == ev::WRITE && conn->ev_callback) {
                                         if (base::call_user_callback(&conn->ev_callback, connection, ev::WRITE, nullptr, 0, nullptr)) {
                                             conn->worker->close_connection(connection, CLOSE_CONN_ERR);
@@ -835,9 +839,9 @@ int manapi::net::worker::TCP::flush_write_(const worker::shared_conn &connection
                                         return;
                                     }
 
-                                    if (conn->flags & CONN_SEND_END && conn->flags & CONN_RECV_END) {
-                                        manapi_log_trace(manapi::debug::LOG_TRACE_LOW, "TCP:packets were sent after closing conn %p",
-                                            connection.get());
+                                    if ((conn->flags & CONN_SEND_END) && (conn->flags & CONN_RECV_END)) {
+                                        manapi_log_trace(manapi::debug::LOG_TRACE_LOW, "TCP:packets(%d) were sent after closing conn %p. now=%d",
+                                            nbuff, connection.get(), conn->top->send_size);
                                         conn->worker->close_connection(connection, CLOSE_CONN_FINISHED);
                                         return;
                                     }

src/worker/ManapiTlsOverTcp.cpp

@@ -175,8 +175,19 @@ ssize_t manapi::net::worker::TLS::sync_write_ex(const shared_conn &conn, ev::buf
                     rhs = this->ssl_write_(connection->ssl, buffer + current,
                         static_cast<int>(cursor - current));
 
-                if (rhs > 0)
+                if (rhs > 0) {
                     current += rhs;
+
+                    if (int erhs = this->ssl_bio_flush_write_(conn, connection, maxcnt, false)) {
+                        if (erhs == CONN_IO_WANT_WRITE) {
+                            if (this->flush_write_(conn, true))
+                                return CONN_IO_ERROR;
+                            return total + current;
+                        }
+
+                        return CONN_IO_ERROR;
+                    }
+                }
                 else {
                     int err = this->ssl_get_error_(connection->ssl, rhs);
 
@@ -253,7 +264,7 @@ ssize_t manapi::net::worker::TLS::sync_write(const shared_conn &conn, ev::buff_t
     if (!size)
         return size;
 
-    return this->sync_write_ex(conn, buff, nbuff, size, finish, static_cast<int>(this->config_->max_buffer_stack));
+    return this->sync_write_ex(conn, buff, nbuff, size, finish, this->config_->max_buffer_stack);
 }
 
 int manapi::net::worker::TLS::event_flags(const shared_conn & conn, int flags) MANAPIHTTP_NOEXCEPT {
@@ -611,20 +622,27 @@ int manapi::net::worker::TLS::conn_after_write(const worker::shared_conn &conn)
         return rhs;
     }
 
-    auto const err = this->ssl_bio_flush_write_(conn, conn->as<tls_connection_t>(),
+    auto const m = conn->as<tls_connection_t>();
+
+    auto const err = this->ssl_bio_flush_write_(conn, m,
         this->config_->max_buffer_stack, false);
 
     if (err) {
         if (err == CONN_IO_WANT_WRITE) {
             if (this->flush_write_(conn, true)) {
-                this->close_connection(conn, CLOSE_CONN_ERR);
-
                 return ERR_UNAVAILABLE;
             }
+
             return ERR_OK;
         }
 
-        this->close_connection(conn, CLOSE_CONN_ERR);
+        return ERR_UNKNOWN;
+    }
+
+    if (m->flags & CONN_TLS_SHUTDOWN || !ssl_is_init_fininshed_(m->ssl)) {
+        if (this->flush_write_(conn, true)) {
+            return ERR_UNAVAILABLE;
+        }
     }
 
     return ERR_OK;