Changeset 0c2d9bb in mainline for uspace/srv/net/tcp/sock.c

Timestamp:

2013-12-25T22:54:29Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b51cf2c

Parents:

f7a33de (diff), ac36aed (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 mainline changes

File:

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

uspace/srv/net/tcp/sock.c

@@ -882 +882 @@
         tcp_sockdata_t *socket;
         tcp_error_t trc;
+        int i;
         int rc;
 
@@ -897 +898 @@
 
         if (socket->conn != NULL) {
+                /* Close connection */
                 trc = tcp_uc_close(socket->conn);
                 if (trc != TCP_EOK && trc != TCP_ENOTEXIST) {
@@ -905 +907 @@
         }
 
+        if (socket->lconn != NULL) {
+                /* Close listening connections */
+                for (i = 0; i < socket->backlog; i++) {
+                        tcp_uc_set_cstate_cb(socket->lconn[i]->conn, NULL, NULL);
+                        trc = tcp_uc_close(socket->lconn[i]->conn);
+                        if (trc != TCP_EOK && trc != TCP_ENOTEXIST) {
+                                fibril_mutex_unlock(&socket->lock);
+                                async_answer_0(callid, EBADF);
+                                return;
+                        }
+
+                        free(socket->lconn[i]);
+                        socket->lconn[i] = NULL;
+                }
+        }
+
         /* Grab recv_buffer_lock because of CV wait in tcp_sock_recv_fibril() */
         fibril_mutex_lock(&socket->recv_buffer_lock);