Changeset 40e29f5 in mainline for uspace/srv/net/socket/socket_client.c

Timestamp:

2010-03-24T18:54:50Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

eaf22d4

Parents:

63f8966 (diff), 3db8889 (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 from lp:~lukasmejdrech/helenos/network.

File:

• uspace/srv/net/socket/socket_client.c (modified) (2 diffs)

uspace/srv/net/socket/socket_client.c

@@ -421 +421 @@
         int socket_id;
         services_t service;
+        ipcarg_t fragment_size;
+        ipcarg_t header_size;
 
         // find the appropriate service
@@ -478 +480 @@
                 return socket_id;
         }
-        if(ERROR_OCCURRED((int) async_req_3_3(phone, NET_SOCKET, socket_id, 0, service, NULL, (ipcarg_t *) &socket->data_fragment_size, (ipcarg_t *) &socket->header_size))){
+        if(ERROR_OCCURRED((int) async_req_3_3(phone, NET_SOCKET, socket_id, 0, service, NULL, &fragment_size, &header_size))){
                 fibril_rwlock_write_unlock(&socket_globals.lock);
                 free(socket);
                 return ERROR_CODE;
         }
+        socket->data_fragment_size = (size_t) fragment_size;
+        socket->header_size = (size_t) header_size;
         // finish the new socket initialization
         socket_initialize(socket, socket_id, phone, service);