Changeset 9ce7eb5 in mainline

Timestamp:

2010-11-07T19:49:00Z (14 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.

Location:

uspace

Files:

• app/netstart/Makefile (modified) (1 diff)
• lib/c/generic/net/modules.c (modified) (5 diffs)
• lib/c/generic/net/packet.c (modified) (4 diffs)
• lib/c/generic/net/socket_client.c (modified) (14 diffs)
• srv/net/net/net.c (modified) (25 diffs)
• srv/net/net/net_standalone.c (modified) (3 diffs)

uspace/app/netstart/Makefile

@@ -29 +29 @@
 
 USPACE_PREFIX = ../..
-LIBS = $(LIBNET_PREFIX)/libnet.a
-EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include
+LIBS = 
+EXTRA_CFLAGS = 
 
 BINARY = netstart

uspace/lib/c/generic/net/modules.c

@@ -41 +41 @@
 #include <async.h>
 #include <malloc.h>
-#include <err.h>
+#include <errno.h>
 #include <sys/time.h>
 
@@ -137 +137 @@
     ipcarg_t arg3, async_client_conn_t client_receiver, suseconds_t timeout)
 {
-        ERROR_DECLARE;
+        int rc;
         
         /* Connect to the needed service */
@@ -144 +144 @@
                 /* Request the bidirectional connection */
                 ipcarg_t phonehash;
-                if (ERROR_OCCURRED(ipc_connect_to_me(phone, arg1, arg2, arg3,
-                    &phonehash))) {
+                
+                rc = ipc_connect_to_me(phone, arg1, arg2, arg3, &phonehash);
+                if (rc != EOK) {
                         ipc_hangup(phone);
-                        return ERROR_CODE;
+                        return rc;
                 }
                 async_new_connection(phonehash, 0, NULL, client_receiver);
@@ -212 +213 @@
 int data_receive(void **data, size_t *length)
 {
-        ERROR_DECLARE;
-
         ipc_callid_t callid;
+        int rc;
 
         if (!data || !length)
@@ -229 +229 @@
 
         // fetch the data
-        if (ERROR_OCCURRED(async_data_write_finalize(callid, *data, *length))) {
+        rc = async_data_write_finalize(callid, *data, *length);
+        if (rc != EOK) {
                 free(data);
-                return ERROR_CODE;
+                return rc;
         }
 

uspace/lib/c/generic/net/packet.c

@@ -41 +41 @@
 #include <unistd.h>
 #include <errno.h>
-#include <err.h>
 
 #include <sys/mman.h>
@@ -91 +90 @@
 int pm_init(void)
 {
-        ERROR_DECLARE;
+        int rc;
 
         fibril_rwlock_initialize(&pm_globals.lock);
+        
         fibril_rwlock_write_lock(&pm_globals.lock);
-        ERROR_PROPAGATE(gpm_initialize(&pm_globals.packet_map));
+        rc = gpm_initialize(&pm_globals.packet_map);
         fibril_rwlock_write_unlock(&pm_globals.lock);
-        return EOK;
+        
+        return rc;
 }
 
@@ -139 +140 @@
 int pm_add(packet_t packet)
 {
-        ERROR_DECLARE;
-
         packet_map_ref map;
+        int rc;
 
         if (!packet_is_valid(packet))
@@ -160 +160 @@
                         }
                         bzero(map, sizeof(packet_map_t));
-                        if ((ERROR_CODE =
-                            gpm_add(&pm_globals.packet_map, map)) < 0) {
+                        rc = gpm_add(&pm_globals.packet_map, map);
+                        if (rc < 0) {
                                 fibril_rwlock_write_unlock(&pm_globals.lock);
                                 free(map);
-                                return ERROR_CODE;
+                                return rc;
                         }
                 } while (PACKET_MAP_PAGE(packet->packet_id) >=

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);

uspace/srv/net/net/net.c

@@ -42 +42 @@
 #include <ddi.h>
 #include <errno.h>
-#include <err.h>
 #include <malloc.h>
 #include <stdio.h>
@@ -92 +91 @@
     const char *value)
 {
-        ERROR_DECLARE;
+        int rc;
         
         measured_string_ref setting =
@@ -100 +99 @@
         
         /* Add the configuration setting */
-        if (ERROR_OCCURRED(measured_strings_add(configuration, name, 0, setting))) {
+        rc = measured_strings_add(configuration, name, 0, setting);
+        if (rc != EOK) {
                 free(setting);
-                return ERROR_CODE;
+                return rc;
         }
         
@@ -110 +110 @@
 /** Generate new system-unique device identifier.
  *
- * @returns The system-unique devic identifier.
- *
+ * @returns             The system-unique devic identifier.
  */
 static device_id_t generate_new_device_id(void)
@@ -120 +119 @@
 static int parse_line(measured_strings_ref configuration, char *line)
 {
-        ERROR_DECLARE;
+        int rc;
         
         /* From the beginning */
@@ -170 +169 @@
         
         /* Add the configuration setting */
-        if (ERROR_OCCURRED(measured_strings_add(configuration, name, 0, setting))) {
+        rc = measured_strings_add(configuration, name, 0, setting);
+        if (rc != EOK) {
                 free(setting);
-                return ERROR_CODE;
+                return rc;
         }
         
@@ -181 +181 @@
     measured_strings_ref configuration)
 {
-        ERROR_DECLARE;
-        
         printf("%s: Reading configuration file %s/%s\n", NAME, directory, filename);
         
@@ -206 +204 @@
                         if (index >= BUFFER_SIZE) {
                                 line[BUFFER_SIZE - 1] = '\0';
-                                fprintf(stderr, "%s: Configuration line %u too long: %s\n",
-                                    NAME, line_number, line);
+                                fprintf(stderr, "%s: Configuration line %u too "
+                                    "long: %s\n", NAME, line_number, line);
                                 
                                 /* No space left in the line buffer */
                                 return EOVERFLOW;
-                        } else {
-                                /* Append the character */
-                                line[index] = (char) read;
-                                index++;
                         }
+                        /* Append the character */
+                        line[index] = (char) read;
+                        index++;
                 } else {
                         /* On error or new line */
                         line[index] = '\0';
                         line_number++;
-                        if (ERROR_OCCURRED(parse_line(configuration, line)))
-                                fprintf(stderr, "%s: Configuration error on line %u: %s\n",
-                                    NAME, line_number, line);
+                        if (parse_line(configuration, line) != EOK) {
+                                fprintf(stderr, "%s: Configuration error on "
+                                    "line %u: %s\n", NAME, line_number, line);
+                        }
                         
                         index = 0;
@@ -270 +268 @@
 static int net_initialize(async_client_conn_t client_connection)
 {
-        ERROR_DECLARE;
+        int rc;
         
         netifs_initialize(&net_globals.netifs);
@@ -278 +276 @@
         
         // TODO: dynamic configuration
-        ERROR_PROPAGATE(read_configuration());
-        
-        ERROR_PROPAGATE(add_module(NULL, &net_globals.modules,
-            LO_NAME, LO_FILENAME, SERVICE_LO, 0, connect_to_service));
-        ERROR_PROPAGATE(add_module(NULL, &net_globals.modules,
-            DP8390_NAME, DP8390_FILENAME, SERVICE_DP8390, 0, connect_to_service));
-        ERROR_PROPAGATE(add_module(NULL, &net_globals.modules,
-            ETHERNET_NAME, ETHERNET_FILENAME, SERVICE_ETHERNET, 0,
-            connect_to_service));
-        ERROR_PROPAGATE(add_module(NULL, &net_globals.modules,
-            NILDUMMY_NAME, NILDUMMY_FILENAME, SERVICE_NILDUMMY, 0,
-            connect_to_service));
+        rc = read_configuration();
+        if (rc != EOK)
+                return rc;
+        
+        rc = add_module(NULL, &net_globals.modules, LO_NAME, LO_FILENAME,
+            SERVICE_LO, 0, connect_to_service);
+        if (rc != EOK)
+                return rc;
+        rc = add_module(NULL, &net_globals.modules, DP8390_NAME,
+            DP8390_FILENAME, SERVICE_DP8390, 0, connect_to_service);
+        if (rc != EOK)
+                return rc;
+        rc = add_module(NULL, &net_globals.modules, ETHERNET_NAME,
+            ETHERNET_FILENAME, SERVICE_ETHERNET, 0, connect_to_service);
+        if (rc != EOK)
+                return rc;
+        rc = add_module(NULL, &net_globals.modules, NILDUMMY_NAME,
+            NILDUMMY_FILENAME, SERVICE_NILDUMMY, 0, connect_to_service);
+        if (rc != EOK)
+                return rc;
         
         /* Build specific initialization */
@@ -314 +320 @@
 static int net_module_start(async_client_conn_t client_connection)
 {
-        ERROR_DECLARE;
+        ipcarg_t phonehash;
+        int rc;
         
         async_set_client_connection(client_connection);
-        ERROR_PROPAGATE(pm_init());
-        
-        ipcarg_t phonehash;
-        
-        if (ERROR_OCCURRED(net_initialize(client_connection)) ||
-            ERROR_OCCURRED(REGISTER_ME(SERVICE_NETWORKING, &phonehash))) {
-                pm_destroy();
-                return ERROR_CODE;
-        }
+        rc = pm_init();
+        if (rc != EOK)
+                return rc;
+        
+        
+        rc = net_initialize(client_connection);
+        if (rc != EOK)
+                goto out;
+        
+        rc = REGISTER_ME(SERVICE_NETWORKING, &phonehash);
+        if (rc != EOK)
+                goto out;
         
         async_manager();
-        
+
+out:
         pm_destroy();
-        return EOK;
+        return rc;
 }
 
@@ -415 +426 @@
 static int start_device(netif_t *netif)
 {
-        ERROR_DECLARE;
+        int rc;
         
         /* Mandatory netif */
@@ -456 +467 @@
         int io = setting ? strtol(setting->value, NULL, 16) : 0;
         
-        ERROR_PROPAGATE(netif_probe_req_remote(netif->driver->phone, netif->id, irq, io));
+        rc = netif_probe_req_remote(netif->driver->phone, netif->id, irq, io);
+        if (rc != EOK)
+                return rc;
         
         /* Network interface layer startup */
@@ -468 +481 @@
                 int mtu = setting ? strtol(setting->value, NULL, 10) : 0;
                 
-                ERROR_PROPAGATE(nil_device_req(netif->nil->phone, netif->id, mtu,
-                    netif->driver->service));
+                rc = nil_device_req(netif->nil->phone, netif->id, mtu,
+                    netif->driver->service);
+                if (rc != EOK)
+                        return rc;
                 
                 internet_service = netif->nil->service;
@@ -478 +493 @@
         switch (netif->il->service) {
         case SERVICE_IP:
-                ERROR_PROPAGATE(ip_device_req(netif->il->phone, netif->id,
-                    internet_service));
+                rc = ip_device_req(netif->il->phone, netif->id,
+                    internet_service);
+                if (rc != EOK)
+                        return rc;
                 break;
         default:
@@ -485 +502 @@
         }
         
-        ERROR_PROPAGATE(netif_start_req_remote(netif->driver->phone, netif->id));
-        return EOK;
+        return netif_start_req_remote(netif->driver->phone, netif->id);
 }
 
@@ -504 +520 @@
 static int startup(void)
 {
-        ERROR_DECLARE;
-        
         const char *conf_files[] = {
                 "lo",
@@ -511 +525 @@
         };
         size_t count = sizeof(conf_files) / sizeof(char *);
+        int rc;
         
         size_t i;
@@ -522 +537 @@
                         return EXDEV;
                 
-                ERROR_PROPAGATE(measured_strings_initialize(&netif->configuration));
+                rc = measured_strings_initialize(&netif->configuration);
+                if (rc != EOK)
+                        return rc;
                 
                 /* Read configuration files */
-                if (ERROR_OCCURRED(read_netif_configuration(conf_files[i], netif))) {
+                rc = read_netif_configuration(conf_files[i], netif);
+                if (rc != EOK) {
                         measured_strings_destroy(&netif->configuration);
                         free(netif);
-                        return ERROR_CODE;
+                        return rc;
                 }
                 
@@ -554 +572 @@
                  * and needed modules.
                  */
-                if ((ERROR_OCCURRED(char_map_add(&net_globals.netif_names,
-                    netif->name, 0, index))) || (ERROR_OCCURRED(start_device(netif)))) {
+                rc = char_map_add(&net_globals.netif_names, netif->name, 0,
+                    index);
+                if (rc != EOK) {
                         measured_strings_destroy(&netif->configuration);
                         netifs_exclude_index(&net_globals.netifs, index);
-                        return ERROR_CODE;
+                        return rc;
+                }
+                
+                rc = start_device(netif);
+                if (rc != EOK) {
+                        measured_strings_destroy(&netif->configuration);
+                        netifs_exclude_index(&net_globals.netifs, index);
+                        return rc;
                 }
                 
@@ -594 +620 @@
     int *answer_count)
 {
-        ERROR_DECLARE;
-        
         measured_string_ref strings;
         char *data;
+        int rc;
         
         *answer_count = 0;
@@ -604 +629 @@
                 return EOK;
         case NET_NET_GET_DEVICE_CONF:
-                ERROR_PROPAGATE(measured_strings_receive(&strings, &data,
-                    IPC_GET_COUNT(call)));
+                rc = measured_strings_receive(&strings, &data,
+                    IPC_GET_COUNT(call));
+                if (rc != EOK)
+                        return rc;
                 net_get_device_conf_req(0, IPC_GET_DEVICE(call), &strings,
                     IPC_GET_COUNT(call), NULL);
@@ -612 +639 @@
                 free(data);
                 
-                ERROR_CODE = measured_strings_reply(strings, IPC_GET_COUNT(call));
+                rc = measured_strings_reply(strings, IPC_GET_COUNT(call));
                 free(strings);
-                return ERROR_CODE;
+                return rc;
         case NET_NET_GET_CONF:
-                ERROR_PROPAGATE(measured_strings_receive(&strings, &data,
-                    IPC_GET_COUNT(call)));
+                rc = measured_strings_receive(&strings, &data,
+                    IPC_GET_COUNT(call));
+                if (rc != EOK)
+                        return rc;
                 net_get_conf_req(0, &strings, IPC_GET_COUNT(call), NULL);
                 
@@ -623 +652 @@
                 free(data);
                 
-                ERROR_CODE = measured_strings_reply(strings, IPC_GET_COUNT(call));
+                rc = measured_strings_reply(strings, IPC_GET_COUNT(call));
                 free(strings);
-                return ERROR_CODE;
+                return rc;
         case NET_NET_STARTUP:
                 return startup();
         }
+        
         return ENOTSUP;
 }
@@ -670 +700 @@
 int main(int argc, char *argv[])
 {
-        ERROR_DECLARE;
-        
-        if (ERROR_OCCURRED(net_module_start(net_client_connection))) {
-                fprintf(stderr, "%s: net_module_start error %i\n", NAME, ERROR_CODE);
-                return ERROR_CODE;
+        int rc;
+        
+        rc = net_module_start(net_client_connection);
+        if (rc != EOK) {
+                fprintf(stderr, "%s: net_module_start error %i\n", NAME, rc);
+                return rc;
         }
         

uspace/srv/net/net/net_standalone.c

@@ -42 +42 @@
 #include <ipc/ipc.h>
 #include <ipc/net.h>
+#include <errno.h>
 
 #include <ip_interface.h>
@@ -60 +61 @@
 int net_initialize_build(async_client_conn_t client_connection)
 {
-        ERROR_DECLARE;
+        int rc;
         
         task_id_t task_id = spawn("/srv/ip");
@@ -66 +67 @@
                 return EINVAL;
         
-        ERROR_PROPAGATE(add_module(NULL, &net_globals.modules, IP_NAME,
-            IP_FILENAME, SERVICE_IP, task_id, ip_connect_module));
+        rc = add_module(NULL, &net_globals.modules, IP_NAME,
+            IP_FILENAME, SERVICE_IP, task_id, ip_connect_module);
+        if (rc != EOK)
+                return rc;
         
         if (!spawn("/srv/icmp"))