Changeset 9ce7eb5 in mainline for uspace/lib/c/generic/net/socket_client.c

Timestamp:

2010-11-07T19:49:00Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

3090715

Parents:

3da12d74 (diff), 16ac756 (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:~jakub/helenos/net.

File:

• uspace/lib/c/generic/net/socket_client.c (modified) (14 diffs)

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

@@ -43 +43 @@
 #include <stdlib.h>
 #include <errno.h>
-#include <err.h>
 
 #include <ipc/services.h>
@@ -212 +211 @@
 static void socket_connection(ipc_callid_t iid, ipc_call_t * icall)
 {
-        ERROR_DECLARE;
-
         ipc_callid_t callid;
         ipc_call_t call;
         socket_ref socket;
+        int rc;
 
 loop:
@@ -231 +229 @@
                     SOCKET_GET_SOCKET_ID(call));
                 if (!socket) {
-                        ERROR_CODE = ENOTSOCK;
+                        rc = ENOTSOCK;
                         fibril_rwlock_read_unlock(&socket_globals.lock);
                         break;
@@ -240 +238 @@
                         fibril_mutex_lock(&socket->receive_lock);
                         // push the number of received packet fragments
-                        if (!ERROR_OCCURRED(dyn_fifo_push(&socket->received,
+                        rc = dyn_fifo_push(&socket->received,
                             SOCKET_GET_DATA_FRAGMENTS(call),
-                            SOCKET_MAX_RECEIVED_SIZE))) {
+                            SOCKET_MAX_RECEIVED_SIZE);
+                        if (rc == EOK) {
                                 // signal the received packet
                                 fibril_condvar_signal(&socket->receive_signal);
@@ -252 +251 @@
                         // push the new socket identifier
                         fibril_mutex_lock(&socket->accept_lock);
-                        if (!ERROR_OCCURRED(dyn_fifo_push(&socket->accepted,
-                            1, SOCKET_MAX_ACCEPTED_SIZE))) {
+                        rc = dyn_fifo_push(&socket->accepted, 1,
+                            SOCKET_MAX_ACCEPTED_SIZE);
+                        if (rc != EOK) {
                                 // signal the accepted socket
                                 fibril_condvar_signal(&socket->accept_signal);
@@ -261 +261 @@
 
                 default:
-                        ERROR_CODE = ENOTSUP;
+                        rc = ENOTSUP;
                 }
 
@@ -280 +280 @@
 
         default:
-                ERROR_CODE = ENOTSUP;
-        }
-
-        ipc_answer_0(callid, (ipcarg_t) ERROR_CODE);
+                rc = ENOTSUP;
+        }
+
+        ipc_answer_0(callid, (ipcarg_t) rc);
         goto loop;
 }
@@ -405 +405 @@
 int socket(int domain, int type, int protocol)
 {
-        ERROR_DECLARE;
-
         socket_ref socket;
         int phone;
@@ -413 +411 @@
         ipcarg_t fragment_size;
         ipcarg_t header_size;
+        int rc;
 
         // find the appropriate service
@@ -479 +478 @@
         }
 
-        if (ERROR_OCCURRED((int) async_req_3_3(phone, NET_SOCKET, socket_id, 0,
-            service, NULL, &fragment_size, &header_size))) {
+        rc = (int) async_req_3_3(phone, NET_SOCKET, socket_id, 0, service, NULL,
+            &fragment_size, &header_size);
+        if (rc != EOK) {
                 fibril_rwlock_write_unlock(&socket_globals.lock);
                 free(socket);
-                return ERROR_CODE;
+                return rc;
         }
 
@@ -492 +492 @@
         socket_initialize(socket, socket_id, phone, service);
         // store the new socket
-        ERROR_CODE = sockets_add(socket_get_sockets(), socket_id, socket);
+        rc = sockets_add(socket_get_sockets(), socket_id, socket);
 
         fibril_rwlock_write_unlock(&socket_globals.lock);
-        if (ERROR_CODE < 0) {
+        if (rc < 0) {
                 dyn_fifo_destroy(&socket->received);
                 dyn_fifo_destroy(&socket->accepted);
@@ -501 +501 @@
                 async_msg_3(phone, NET_SOCKET_CLOSE, (ipcarg_t) socket_id, 0,
                     service);
-                return ERROR_CODE;
+                return rc;
         }
 
@@ -770 +770 @@
 int closesocket(int socket_id)
 {
-        ERROR_DECLARE;
-
         socket_ref socket;
+        int rc;
 
         fibril_rwlock_write_lock(&socket_globals.lock);
@@ -787 +786 @@
 
         // request close
-        ERROR_PROPAGATE((int) async_req_3_0(socket->phone, NET_SOCKET_CLOSE,
-            (ipcarg_t) socket->socket_id, 0, socket->service));
+        rc = (int) async_req_3_0(socket->phone, NET_SOCKET_CLOSE,
+            (ipcarg_t) socket->socket_id, 0, socket->service);
+        if (rc != EOK) {
+                fibril_rwlock_write_unlock(&socket_globals.lock);
+                return rc;
+        }
         // free the socket structure
         socket_destroy(socket);