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


Ignore:
Timestamp:
2010-03-21T09:25:29Z (15 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:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/net/tl/tcp/tcp.c

    rfacebd56 re2b73d4f  
    10601060        int app_phone = IPC_GET_PHONE(&call);
    10611061        struct sockaddr * addr;
     1062        int socket_id;
    10621063        size_t addrlen;
    10631064        fibril_rwlock_t lock;
     
    11041105                                        socket_data->local_sockets = &local_sockets;
    11051106                                        fibril_rwlock_write_lock(&lock);
    1106                                         *SOCKET_SET_SOCKET_ID(answer) = SOCKET_GET_SOCKET_ID(call);
    1107                                         res = socket_create(&local_sockets, app_phone, socket_data, SOCKET_SET_SOCKET_ID(answer));
     1107                                        socket_id = SOCKET_GET_SOCKET_ID(call);
     1108                                        res = socket_create(&local_sockets, app_phone, socket_data, &socket_id);
     1109                                        *SOCKET_SET_SOCKET_ID(answer) = socket_id;
    11081110                                        fibril_rwlock_write_unlock(&lock);
    11091111                                        if(res == EOK){
Note: See TracChangeset for help on using the changeset viewer.