Changes in uspace/srv/net/tl/tcp/sock.c [522a4f9:d9e14fa4] in mainline

File:

• uspace/srv/net/tl/tcp/sock.c (modified) (2 diffs)

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

@@ -215 +215 @@
         tcp_sock_t lsocket;
         tcp_sock_t fsocket;
-        nic_device_id_t dev_id;
+        device_id_t dev_id;
         tcp_phdr_t *phdr;
         size_t phdr_len;
@@ -603 +603 @@
 
         socket = (tcp_sockdata_t *)sock_core->specific_data;
-
-        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 = 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,