Changeset 415578ef in mainline

Timestamp:

2011-12-16T18:55:14Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

522a4f9

Parents:

e1c6dde9

Message:

Not all sockets are connected.

Location:

uspace

Files:

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

uspace/app/websrv/websrv.c

@@ -304 +304 @@
                 if (rc != EOK) {
                         printf("Error closing connection socket: %d\n", rc);
+                        closesocket(listen_sd);
                         return 1;
                 }

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);
-
-        tcp_uc_delete(socket->conn);
+
+        if (socket->conn != NULL) {
+                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);
+
+                tcp_uc_delete(socket->conn);
+        }
 
         rc = socket_destroy(net_sess, socket_id, &client->sockets, &gsock,