Changeset 309469de in mainline

Timestamp:

2015-05-09T19:28:32Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b99f6e2

Parents:

1d4b815

Message:

Need to clean up dangling resources when client closes session.

Location:

uspace/srv/net

Files:

• tcp/service.c (modified) (4 diffs)
• udp/service.c (modified) (3 diffs)

uspace/srv/net/tcp/service.c

@@ -783 +783 @@
 
 #include <mem.h>
+
+static void tcp_client_init(tcp_client_t *client)
+{
+        memset(client, 0, sizeof(tcp_client_t));
+        client->sess = NULL;
+        list_initialize(&client->cconn);
+        list_initialize(&client->clst);
+}
+
+static void tcp_client_fini(tcp_client_t *client)
+{
+        tcp_cconn_t *cconn;
+        size_t n;
+
+        n = list_count(&client->cconn);
+        if (n != 0) {
+                log_msg(LOG_DEFAULT, LVL_WARN, "Client with %zu active "
+                    "connections closed session", n);
+
+                while (!list_empty(&client->cconn)) {
+                        cconn = list_get_instance(list_first(&client->cconn),
+                            tcp_cconn_t, lclient);
+                        tcp_uc_close(cconn->conn);
+                        tcp_cconn_destroy(cconn);
+                }
+        }
+
+        n = list_count(&client->clst);
+        if (n != 0) {
+                log_msg(LOG_DEFAULT, LVL_WARN, "Client with %zu active "
+                    "listeners closed session", n);
+                /* XXX Destroy listeners */
+        }
+}
+
 static void tcp_client_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
@@ -793 +828 @@
             &client);
 
-        memset(&client, 0, sizeof(client));
-        client.sess = NULL;
-        list_initialize(&client.cconn);
-        list_initialize(&client.clst);
-//      list_initialize(&client.crcv_queue);
+        tcp_client_init(&client);
 
         while (true) {
@@ -810 +841 @@
                         /* The other side has hung up */
                         async_answer_0(callid, EOK);
-                        return;
+                        break;
                 }
 
@@ -852 +883 @@
                 }
         }
-        log_msg(LOG_DEFAULT, LVL_DEBUG,
-            "tcp_client_conn TERMINATED ***************************");
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_client_conn TERMINATED");
+        tcp_client_fini(&client);
 }
 

uspace/srv/net/udp/service.c

@@ -493 +493 @@
 {
         udp_client_t client;
+        size_t n;
 
         /* Accept the connection */
@@ -513 +514 @@
                         /* The other side has hung up */
                         async_answer_0(callid, EOK);
-                        return;
+                        break;
                 }
 
@@ -543 +544 @@
                 }
         }
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_client_conn: terminated");
+
+        n = list_count(&client.cassoc);
+        if (n != 0) {
+                log_msg(LOG_DEFAULT, LVL_WARN, "udp_client_conn: "
+                    "Client with %zu active associations closed session.", n);
+                /* XXX Clean up */
+        }
+
+        /* XXX Clean up client receive queue */
 }