Changeset b0d82d1 in mainline

Timestamp:

2011-11-30T21:36:36Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

26ec91c

Parents:

23fe06c

Message:

Implement socket close. Unlock mutexes on error paths.

Location:

uspace

Files:

• app/nettest3/nettest3.c (modified) (1 diff)
• srv/net/tl/tcp/sock.c (modified) (2 diffs)
• srv/net/tl/tcp/ucall.c (modified) (2 diffs)

uspace/app/nettest3/nettest3.c

@@ -93 +93 @@
         } while (rc > 0);
 
-        async_usleep(15*1000*1000);
+        async_usleep(1000*1000);
 
         printf("closesocket()\n");

uspace/srv/net/tl/tcp/sock.c

@@ -553 +553 @@
         socket_core_t *sock_core;
         tcp_sockdata_t *socket;
+        tcp_error_t trc;
         int rc;
+        uint8_t buffer[FRAGMENT_SIZE];
+        size_t data_len;
+        xflags_t xflags;
 
         log_msg(LVL_DEBUG, "tcp_sock_close()");
@@ -565 +569 @@
 
         socket = (tcp_sockdata_t *)sock_core->specific_data;
-        (void) socket;
-        /* XXX Close */
+        rc = tcp_uc_close(socket->conn);
+        if (rc != EOK) {
+                async_answer_0(callid, rc);
+                return;
+        }
+
+        /* Drain incoming data. This should really be done in the background. */
+        do {
+                trc = tcp_uc_receive(socket->conn, buffer, FRAGMENT_SIZE,
+                    &data_len, &xflags);
+        } while (trc == TCP_EOK);
 
         rc = socket_destroy(net_sess, socket_id, &client->sockets, &gsock,

uspace/srv/net/tl/tcp/ucall.c

@@ -91 +91 @@
 
         if (nconn->cstate != st_established) {
+                fibril_mutex_unlock(&nconn->cstate_lock);
+
                 log_msg(LVL_DEBUG, "tcp_uc_open: Connection was reset.");
                 assert(nconn->cstate == st_closed);
@@ -163 +165 @@
 
         if (conn->rcv_buf_used == 0) {
+                fibril_mutex_unlock(&conn->rcv_buf_lock);
+
                 /* End of data, peer closed connection. */
                 assert(conn->rcv_buf_fin);