fix tcp, tls and examples

Ichishino · Jan 5, 2024 · 03eabaf · 03eabaf
1 parent 86a49bc
commit 03eabaf
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 27 deletions.
diff --git a/examples/http1_http2_server/main.c b/examples/http1_http2_server/main.c
@@ -408,15 +408,20 @@ app_on_destroy(
 {
     co_tls_tcp_server_destroy(self->tcp_server);
 
-    co_list_iterator_t* it =
-        co_list_get_head_iterator(self->tcp_clients);
-    while (it != NULL)
+    if (self->tcp_clients != NULL)
     {
-        co_list_data_st* data =
-            co_list_get_next(self->tcp_clients, &it);
-        co_tls_tcp_client_destroy((co_tcp_client_t*)data->value);
+        co_list_iterator_t* it =
+            co_list_get_head_iterator(self->tcp_clients);
+
+        while (it != NULL)
+        {
+            co_list_data_st* data =
+                co_list_get_next(self->tcp_clients, &it);
+            co_tls_tcp_client_destroy((co_tcp_client_t*)data->value);
+        }
+
+        co_list_destroy(self->tcp_clients);
     }
-    co_list_destroy(self->tcp_clients);
 
     co_list_destroy(self->http_clients);
     co_list_destroy(self->http2_clients);

diff --git a/examples/http2_server/main.c b/examples/http2_server/main.c
@@ -509,15 +509,20 @@ app_on_destroy(
 {
     co_tls_tcp_server_destroy(self->tcp_server);
 
-    co_list_iterator_t* it =
-        co_list_get_head_iterator(self->tcp_clients);
-    while (it != NULL)
+    if (self->tcp_clients != NULL)
     {
-        co_list_data_st* data =
-            co_list_get_next(self->tcp_clients, &it);
-        co_tls_tcp_client_destroy((co_tcp_client_t*)data->value);
+        co_list_iterator_t* it =
+            co_list_get_head_iterator(self->tcp_clients);
+
+        while (it != NULL)
+        {
+            co_list_data_st* data =
+                co_list_get_next(self->tcp_clients, &it);
+            co_tls_tcp_client_destroy((co_tcp_client_t*)data->value);
+        }
+
+        co_list_destroy(self->tcp_clients);
     }
-    co_list_destroy(self->tcp_clients);
 
     co_list_destroy(self->http2_clients);
 }

diff --git a/examples/https_server/main.c b/examples/https_server/main.c
@@ -124,8 +124,6 @@ app_on_http_close(
     co_http_client_t* http_client
 )
 {
-    (void)self;
-
     app_client_log(http, http_client, "http closed");
 
     co_list_remove(self->http_clients, http_client);
@@ -217,8 +215,6 @@ app_on_tcp_close(
     co_tcp_client_t* tcp_client
 )
 {
-    (void)self;
-
     app_client_log(tcp, tcp_client, "tcp closed");
 
     co_list_remove(self->tcp_clients, tcp_client);
@@ -331,15 +327,20 @@ app_on_destroy(
     app_st* self
 )
 {
-    co_list_iterator_t* it =
-        co_list_get_head_iterator(self->tcp_clients);
-    while (it != NULL)
+    if (self->tcp_clients != NULL)
     {
-        co_list_data_st* data =
-            co_list_get_next(self->tcp_clients, &it);
-        co_tls_tcp_client_destroy((co_tcp_client_t*)data->value);
+        co_list_iterator_t* it =
+            co_list_get_head_iterator(self->tcp_clients);
+
+        while (it != NULL)
+        {
+            co_list_data_st* data =
+                co_list_get_next(self->tcp_clients, &it);
+            co_tls_tcp_client_destroy((co_tcp_client_t*)data->value);
+        }
+
+        co_list_destroy(self->tcp_clients);
     }
-    co_list_destroy(self->tcp_clients);
 
     co_list_destroy(self->http_clients);
 

diff --git a/src/net/co_tcp_client.c b/src/net/co_tcp_client.c
@@ -360,8 +360,6 @@ co_tcp_client_on_close(
         &client->sock.remote.net_addr,
         "tcp closed by peer");
 
-    client->sock.local.is_open = false;
-
     if (client->callbacks.on_close != NULL)
     {
         client->callbacks.on_close(client->sock.owner_thread, client);

diff --git a/src/tls/co_tls_client.c b/src/tls/co_tls_client.c
@@ -365,6 +365,11 @@ co_tls_on_handshake_receive(
     co_socket_t* sock
 )
 {
+    if (sock->tls == NULL)
+    {
+        return;
+    }
+
     co_tls_client_t* tls = (co_tls_client_t*)sock->tls;
 
 #ifdef CO_OS_WIN
@@ -451,6 +456,11 @@ co_tls_on_handshake_timer(
     co_socket_t* sock =
         (co_socket_t*)co_timer_get_user_data(timer);
 
+    if (sock->tls == NULL)
+    {
+        return;
+    }
+
     co_tls_log_error(
         &sock->local.net_addr, "<--", &sock->remote.net_addr,
         "tls handshake timeout");