Changeset 87b4baa in mainline for uspace/lib/c/generic/net/socket_client.c

Timestamp:

2010-12-17T20:16:46Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

424558a

Parents:

463e734 (diff), bbc74af7 (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/lib/c/generic/net/socket_client.c (modified) (20 diffs)

uspace/lib/c/generic/net/socket_client.c

@@ -214 +214 @@
         callid = async_get_call(&call);
 
-        switch (IPC_GET_METHOD(call)) {
+        switch (IPC_GET_IMETHOD(call)) {
         case NET_SOCKET_RECEIVED:
         case NET_SOCKET_ACCEPTED:
@@ -229 +229 @@
                 }
                 
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case NET_SOCKET_RECEIVED:
                         fibril_mutex_lock(&socket->receive_lock);
@@ -278 +278 @@
         }
 
-        ipc_answer_0(callid, (ipcarg_t) rc);
+        ipc_answer_0(callid, (sysarg_t) rc);
         goto loop;
 }
@@ -404 +404 @@
         int socket_id;
         services_t service;
-        ipcarg_t fragment_size;
-        ipcarg_t header_size;
+        sysarg_t fragment_size;
+        sysarg_t header_size;
         int rc;
 
@@ -494 +494 @@
                 dyn_fifo_destroy(&socket->accepted);
                 free(socket);
-                async_msg_3(phone, NET_SOCKET_CLOSE, (ipcarg_t) socket_id, 0,
+                async_msg_3(phone, NET_SOCKET_CLOSE, (sysarg_t) socket_id, 0,
                     service);
                 return rc;
@@ -516 +516 @@
  */
 static int
-socket_send_data(int socket_id, ipcarg_t message, ipcarg_t arg2,
+socket_send_data(int socket_id, sysarg_t message, sysarg_t arg2,
     const void *data, size_t datalength)
 {
         socket_t *socket;
         aid_t message_id;
-        ipcarg_t result;
+        sysarg_t result;
 
         if (!data)
@@ -540 +540 @@
         // request the message
         message_id = async_send_3(socket->phone, message,
-            (ipcarg_t) socket->socket_id, arg2, socket->service, NULL);
+            (sysarg_t) socket->socket_id, arg2, socket->service, NULL);
         // send the address
         async_data_write_start(socket->phone, data, datalength);
@@ -600 +600 @@
         // request listen backlog change
         result = (int) async_req_3_0(socket->phone, NET_SOCKET_LISTEN,
-            (ipcarg_t) socket->socket_id, (ipcarg_t) backlog, socket->service);
+            (sysarg_t) socket->socket_id, (sysarg_t) backlog, socket->service);
 
         fibril_rwlock_read_unlock(&socket_globals.lock);
@@ -625 +625 @@
         socket_t *new_socket;
         aid_t message_id;
-        ipcarg_t ipc_result;
+        sysarg_t ipc_result;
         int result;
         ipc_call_t answer;
@@ -683 +683 @@
         // request accept
         message_id = async_send_5(socket->phone, NET_SOCKET_ACCEPT,
-            (ipcarg_t) socket->socket_id, 0, socket->service, 0,
+            (sysarg_t) socket->socket_id, 0, socket->service, 0,
             new_socket->socket_id, &answer);
 
@@ -782 +782 @@
         // request close
         rc = (int) async_req_3_0(socket->phone, NET_SOCKET_CLOSE,
-            (ipcarg_t) socket->socket_id, 0, socket->service);
+            (sysarg_t) socket->socket_id, 0, socket->service);
         if (rc != EOK) {
                 fibril_rwlock_write_unlock(&socket_globals.lock);
@@ -815 +815 @@
  */
 static int
-sendto_core(ipcarg_t message, int socket_id, const void *data,
+sendto_core(sysarg_t message, int socket_id, const void *data,
     size_t datalength, int flags, const struct sockaddr *toaddr,
     socklen_t addrlen)
@@ -821 +821 @@
         socket_t *socket;
         aid_t message_id;
-        ipcarg_t result;
+        sysarg_t result;
         size_t fragments;
         ipc_call_t answer;
@@ -855 +855 @@
         // request send
         message_id = async_send_5(socket->phone, message,
-            (ipcarg_t) socket->socket_id,
+            (sysarg_t) socket->socket_id,
             (fragments == 1 ? datalength : socket->data_fragment_size),
-            socket->service, (ipcarg_t) flags, fragments, &answer);
+            socket->service, (sysarg_t) flags, fragments, &answer);
 
         // send the address if given
@@ -973 +973 @@
  */
 static int
-recvfrom_core(ipcarg_t message, int socket_id, void *data, size_t datalength,
+recvfrom_core(sysarg_t message, int socket_id, void *data, size_t datalength,
     int flags, struct sockaddr *fromaddr, socklen_t *addrlen)
 {
         socket_t *socket;
         aid_t message_id;
-        ipcarg_t ipc_result;
+        sysarg_t ipc_result;
         int result;
         size_t fragments;
@@ -1031 +1031 @@
                 // request packet data
                 message_id = async_send_4(socket->phone, message,
-                    (ipcarg_t) socket->socket_id, 0, socket->service,
-                    (ipcarg_t) flags, &answer);
+                    (sysarg_t) socket->socket_id, 0, socket->service,
+                    (sysarg_t) flags, &answer);
 
                 // read the address if desired
@@ -1060 +1060 @@
                 // request packet data
                 message_id = async_send_4(socket->phone, message,
-                    (ipcarg_t) socket->socket_id, 0, socket->service,
-                    (ipcarg_t) flags, &answer);
+                    (sysarg_t) socket->socket_id, 0, socket->service,
+                    (sysarg_t) flags, &answer);
 
                 // read the address if desired
@@ -1160 +1160 @@
         socket_t *socket;
         aid_t message_id;
-        ipcarg_t result;
+        sysarg_t result;
 
         if (!value || !optlen)
@@ -1179 +1179 @@
         // request option value
         message_id = async_send_3(socket->phone, NET_SOCKET_GETSOCKOPT,
-            (ipcarg_t) socket->socket_id, (ipcarg_t) optname, socket->service,
+            (sysarg_t) socket->socket_id, (sysarg_t) optname, socket->service,
             NULL);
 
@@ -1214 +1214 @@
         // send the value
         return socket_send_data(socket_id, NET_SOCKET_SETSOCKOPT,
-            (ipcarg_t) optname, value, optlen);
+            (sysarg_t) optname, value, optlen);
 }