Changeset 1440eae in mainline for uspace/srv/net/tl/tcp/sock.c

Timestamp:

2011-12-22T12:04:54Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

3819ce5

Parents:

65d7b0a (diff), a438de4 (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

File:

• uspace/srv/net/tl/tcp/sock.c (modified) (1 diff)

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

@@ -603 +603 @@
 
         socket = (tcp_sockdata_t *)sock_core->specific_data;
-        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);
+
+        if (socket->conn != NULL) {
+                trc = tcp_uc_close(socket->conn);
+                if (trc != TCP_EOK && trc != TCP_ENOTEXIST) {
+                        async_answer_0(callid, EBADF);
+                        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);
+
+                tcp_uc_delete(socket->conn);
+        }
 
         rc = socket_destroy(net_sess, socket_id, &client->sockets, &gsock,