Changeset d37d500e in mainline

Timestamp:

2012-04-20T09:53:01Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

2d1f7a21

Parents:

bae2a79e (diff), 0d520a2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline

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);
 }