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

Timestamp:

2012-07-10T11:53:50Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

1e01a35

Parents:

a33706e (diff), 33fc3ae (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) (2 diffs)

uspace/srv/net/tcp/sock.c

@@ -68 +68 @@
 int tcp_sock_init(void)
 {
-        int rc;
-
         socket_ports_initialize(&gsock);
-
+        
         async_set_client_connection(tcp_sock_connection);
-
-        rc = service_register(SERVICE_TCP);
+        
+        int rc = service_register(SERVICE_TCP);
         if (rc != EOK)
                 return EEXIST;
-
+        
         return EOK;
 }
@@ -153 +151 @@
             sock, sock_id);
 
-        if (rc != EOK)
+        if (rc != EOK) {
+                fibril_destroy(sock->recv_fibril);
+                sock->recv_fibril = 0;
                 return rc;
+        }
 
         sock_core = socket_cores_find(&sock->client->sockets, *sock_id);