Changeset e2b73d4f in mainline for uspace/srv/net/tl/tcp/tcp.c

Timestamp:

2010-03-21T09:25:29Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

19f857a

Parents:

facebd56 (diff), 4e9aaf5 (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/tl/tcp/tcp.c (modified) (2 diffs)

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

@@ -1060 +1060 @@
         int app_phone = IPC_GET_PHONE(&call);
         struct sockaddr * addr;
+        int socket_id;
         size_t addrlen;
         fibril_rwlock_t lock;
@@ -1104 +1105 @@
                                         socket_data->local_sockets = &local_sockets;
                                         fibril_rwlock_write_lock(&lock);
-                                        *SOCKET_SET_SOCKET_ID(answer) = SOCKET_GET_SOCKET_ID(call);
-                                        res = socket_create(&local_sockets, app_phone, socket_data, SOCKET_SET_SOCKET_ID(answer));
+                                        socket_id = SOCKET_GET_SOCKET_ID(call);
+                                        res = socket_create(&local_sockets, app_phone, socket_data, &socket_id);
+                                        *SOCKET_SET_SOCKET_ID(answer) = socket_id;
                                         fibril_rwlock_write_unlock(&lock);
                                         if(res == EOK){