Changeset 0d520a2 in mainline

Timestamp:

2012-04-20T09:48:56Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

50b581d, d37d500e

Parents:

606c369

Message:

tcp_sock_connection() and udp_sock_connection() need to clean up when exiting.

Location:

uspace/srv/net

Files:

• tcp/sock.c (modified) (2 diffs)
• udp/sock.c (modified) (3 diffs)

uspace/srv/net/tcp/sock.c

@@ -89 +89 @@
         socket = (tcp_sockdata_t *)sock_core->specific_data;
         (void)socket;
+
+        /* XXX We need to initiate connection cleanup here */
 }
 
@@ -835 +837 @@
                 }
         }
+
+        /* Clean up */
+        log_msg(LVL_DEBUG, "tcp_sock_connection: Clean up");
+        async_hangup(client.sess);
+        socket_cores_release(NULL, &client.sockets, &gsock, tcp_free_sock_data);
 }
 

uspace/srv/net/udp/sock.c

@@ -85 +85 @@
 
         socket = (udp_sockdata_t *)sock_core->specific_data;
-        (void)socket;
+        assert(socket->assoc != NULL);
+        udp_uc_destroy(socket->assoc);
 }
 
@@ -513 +514 @@
         fibril_mutex_lock(&socket->lock);
 
-        assert(socket->assoc != NULL);
-        udp_uc_destroy(socket->assoc);
-
         rc = socket_destroy(NULL, socket_id, &client->sockets, &gsock,
             udp_free_sock_data);
@@ -599 +597 @@
                 }
         }
+
+        /* Clean up */
+        log_msg(LVL_DEBUG, "udp_sock_connection: Clean up");
+        async_hangup(client.sess);
+        socket_cores_release(NULL, &client.sockets, &gsock, udp_free_sock_data);
 }