Changeset 00d7e1b in mainline for uspace/srv/net

Timestamp:

2011-10-07T20:20:33Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

49bd793b

Parents:

e2c50e1

Message:

networking improvements

• start the networking stack from init
• add loopback network interface driver (cherrypicked and sanitized from lp:~helenos-nicf/helenos/nicf)
• add libnic and various small pieces from lp:~helenos-nicf/helenos/nicf
• fix client side of NIC_GET_ADDRESS
• net binary overhaul

Note: "ping 127.0.0.1" works, but the first three pings timeout for some reason

Location:

uspace/srv/net

Files:

• il/ip/ip.c (modified) (8 diffs)
• net/Makefile (modified) (1 diff)
• net/net.c (modified) (15 diffs)
• net/net.h (modified) (4 diffs)
• net/net_standalone.c (deleted)
• net/packet_server.h (modified) (1 diff)
• nil/eth/eth.c (modified) (1 diff)
• nil/nildummy/nildummy.c (modified) (1 diff)

uspace/srv/net/il/ip/ip.c

@@ -354 +354 @@
         ip_netif->routing = NET_DEFAULT_IP_ROUTING;
         configuration = &names[0];
-
+        
         /* Get configuration */
         rc = net_get_device_conf_req(ip_globals.net_sess, ip_netif->device_id,
@@ -406 +406 @@
                         return ENOTSUP;
                 }
-
+                
                 if (configuration[6].value) {
                         ip_netif->arp = get_running_module(&ip_globals.modules,
@@ -417 +417 @@
                         }
                 }
+                
                 if (configuration[7].value)
                         ip_netif->routing = (configuration[7].value[0] == 'y');
-
+                
                 net_free_settings(configuration, data);
         }
-
+        
         /* Bind netif service which also initializes the device */
         ip_netif->sess = nil_bind_service(ip_netif->service,
@@ -432 +433 @@
                 return ENOENT;
         }
-
+        
         /* Has to be after the device netif module initialization */
         if (ip_netif->arp) {
@@ -448 +449 @@
                 }
         }
-
+        
         /* Get packet dimensions */
         rc = nil_packet_size_req(ip_netif->sess, ip_netif->device_id,
@@ -461 +462 @@
                 ip_netif->packet_dimension.content = IP_MIN_CONTENT;
         }
-
+        
         index = ip_netifs_add(&ip_globals.netifs, ip_netif->device_id, ip_netif);
         if (index < 0)
@@ -478 +479 @@
                 printf("%s: Default gateway (%s)\n", NAME, defgateway);
         }
-
+        
         return EOK;
 }
@@ -498 +499 @@
                 return rc;
         }
-
+        
         ip_netif->device_id = device_id;
         ip_netif->service = netif;
         ip_netif->state = NIC_STATE_STOPPED;
-
+        
         fibril_rwlock_write_lock(&ip_globals.netifs_lock);
 

uspace/srv/net/net/Makefile

@@ -43 +43 @@
 SOURCES = \
         net.c \
-        net_standalone.c \
         packet_server.c
 

uspace/srv/net/net/net.c

@@ -30 +30 @@
 /** @addtogroup net
  * @{
- */
-
-/** @file
- * Networking subsystem central module implementation.
- *
  */
 
@@ -55 +50 @@
 #include <ipc/ip.h>
 #include <ipc/nil.h>
-#include <net/modules.h>
 #include <net/packet.h>
 #include <net/device.h>
@@ -72 +66 @@
 #include "packet_server.h"
 
-/** Networking module name. */
-#define NAME  "net"
-
 #define MAX_PATH_LENGTH  1024
 
@@ -82 +73 @@
 GENERIC_CHAR_MAP_IMPLEMENT(measured_strings, measured_string_t);
 DEVICE_MAP_IMPLEMENT(netifs, netif_t);
-
-static int startup(void);
 
 /** Add the configured setting to the configuration map.
@@ -95 +84 @@
  *
  */
-int add_configuration(measured_strings_t *configuration, const uint8_t *name,
-    const uint8_t *value)
+static int add_configuration(measured_strings_t *configuration,
+    const uint8_t *name, const uint8_t *value)
 {
         int rc;
@@ -146 +135 @@
                     (uint8_t *) entry->key, (uint8_t *) entry->value);
                 if (rc != EOK) {
-                        printf("%s: Error processing configuration\n", NAME);
                         cfg_unload(&cfg);
                         return rc;
@@ -180 +168 @@
         return read_configuration_file(CONF_DIR, CONF_GENERAL_FILE,
             &net_globals.configuration);
-}
-
-/** Initialize the networking module.
- *
- * @param[in] client_connection The client connection processing
- *                              function. The module skeleton propagates
- *                              its own one.
- *
- * @return EOK on success.
- * @return ENOMEM if there is not enough memory left.
- *
- */
-static int net_initialize(async_client_conn_t client_connection)
-{
-        int rc;
-        
-        netifs_initialize(&net_globals.netifs);
-        char_map_initialize(&net_globals.netif_hwpaths);
-        modules_initialize(&net_globals.modules);
-        measured_strings_initialize(&net_globals.configuration);
-        
-        rc = read_configuration();
-        if (rc != EOK)
-                return rc;
-        
-        rc = add_module(NULL, &net_globals.modules, (uint8_t *) ETHERNET_NAME,
-            (uint8_t *) ETHERNET_FILENAME, SERVICE_ETHERNET, 0, connect_to_service);
-        if (rc != EOK)
-                return rc;
-        
-        rc = add_module(NULL, &net_globals.modules, (uint8_t *) NILDUMMY_NAME,
-            (uint8_t *) NILDUMMY_FILENAME, SERVICE_NILDUMMY, 0, connect_to_service);
-        if (rc != EOK)
-                return rc;
-        
-        /* Build specific initialization */
-        return net_initialize_build(client_connection);
-}
-
-/** Start the networking module.
- *
- * Initializes the client connection serving function,
- * initializes the module, registers the module service
- * and starts the async manager, processing IPC messages
- * in an infinite loop.
- *
- * @param[in] client_connection The client connection
- *                              processing function. The
- *                              module skeleton propagates
- *                              its own one.
- *
- * @return EOK on successful module termination.
- * @return Other error codes as defined for the net_initialize() function.
- * @return Other error codes as defined for the REGISTER_ME() macro function.
- *
- */
-static int net_module_start(async_client_conn_t client_connection)
-{
-        int rc;
-        
-        async_set_client_connection(client_connection);
-        rc = pm_init();
-        if (rc != EOK)
-                return rc;
-        
-        rc = packet_server_init();
-        if (rc != EOK)
-                goto out;
-        
-        rc = net_initialize(client_connection);
-        if (rc != EOK)
-                goto out;
-        
-        rc = startup();
-        if (rc != EOK)
-                goto out;
-        
-        rc = service_register(SERVICE_NETWORKING);
-        if (rc != EOK)
-                goto out;
-        
-        task_retval(0);
-        async_manager();
-
-out:
-        pm_destroy();
-        return rc;
 }
 
@@ -388 +289 @@
 static int init_device(netif_t *netif, devman_handle_t handle)
 {
+        printf("%s: Initializing device '%s'\n", NAME, netif->name);
+        
         netif->handle = handle;
         netif->sess = devman_device_connect(EXCHANGE_SERIALIZE, netif->handle,
@@ -459 +362 @@
         }
         
+        printf("%s: Activating device '%s'\n", NAME, netif->name);
         return nic_set_state(netif->sess, NIC_STATE_ACTIVE);
 }
 
-static int net_driver_port_ready(devman_handle_t handle)
+static int net_port_ready(devman_handle_t handle)
 {
         char hwpath[MAX_PATH_LENGTH];
@@ -500 +404 @@
         
         for (size_t i = 0; i < count; i++) {
-                rc = net_driver_port_ready(funs[i]);
+                rc = net_port_ready(funs[i]);
                 if (rc != EOK)
                         return rc;
         }
         
-        return EOK;
-}
-
-/** Read the configuration and start all network interfaces.
- *
- * @return EOK on success.
- * @return EXDEV if there is no available system-unique device identifier.
- * @return EINVAL if any of the network interface names are not configured.
- * @return ENOMEM if there is not enough memory left.
- * @return Other error codes as defined for the read_configuration()
- *         function.
- * @return Other error codes as defined for the read_netif_configuration()
- *         function.
- * @return Other error codes as defined for the start_device() function.
- *
- */
-static int startup(void)
-{
-        int rc;
-        
-        DIR *config_dir = opendir(CONF_DIR);
-        if (config_dir == NULL)
-                return ENOENT;
-        
-        struct dirent *dir_entry;
-        while ((dir_entry = readdir(config_dir))) {
-                if (str_cmp(dir_entry->d_name + str_length(dir_entry->d_name)
-                        - str_length(CONF_EXT), CONF_EXT) != 0)
-                        continue;
-                
-                netif_t *netif = (netif_t *) malloc(sizeof(netif_t));
-                if (!netif)
-                        continue;
-                
-                netif->handle = -1;
-                netif->sess = NULL;
-                
-                netif->id = generate_new_device_id();
-                if (!netif->id) {
-                        free(netif);
-                        continue;
-                }
-                
-                rc = measured_strings_initialize(&netif->configuration);
-                if (rc != EOK) {
-                        free(netif);
-                        continue;
-                }
-                
-                rc = read_netif_configuration(dir_entry->d_name, netif);
-                if (rc != EOK) {
-                        free(netif);
-                        continue;
-                }
-                
-                /* Mandatory name */
-                measured_string_t *name = measured_strings_find(&netif->configuration,
-                    (uint8_t *) CONF_NAME, 0);
-                if (!name) {
-                        printf("%s: Network interface name is missing\n", NAME);
-                        measured_strings_destroy(&netif->configuration, free);
-                        free(netif);
-                        continue;
-                }
-                
-                netif->name = name->value;
-                
-                /* Mandatory hardware path */
-                measured_string_t *hwpath = measured_strings_find(
-                    &netif->configuration, (const uint8_t *) CONF_HWPATH, 0);
-                if (!hwpath) {
-                        measured_strings_destroy(&netif->configuration, free);
-                        free(netif);
-                }
-                
-                /* Add to the netifs map */
-                int index = netifs_add(&net_globals.netifs, netif->id, netif);
-                if (index < 0) {
-                        measured_strings_destroy(&netif->configuration, free);
-                        free(netif);
-                        continue;
-                }
-                
-                /*
-                 * Add to the hardware paths map and init network interfaces
-                 * and needed modules.
-                 */
-                rc = char_map_add(&net_globals.netif_hwpaths, hwpath->value, 0, index);
-                if (rc != EOK) {
-                        measured_strings_destroy(&netif->configuration, free);
-                        netifs_exclude_index(&net_globals.netifs, index, free);
-                        continue;
-                }
-        }
-        
-        closedir(config_dir);
         return EOK;
 }
@@ -619 +427 @@
  *
  */
-int net_message(ipc_callid_t callid, ipc_call_t *call, ipc_call_t *answer,
-    size_t *answer_count)
+static int net_message(ipc_callid_t callid, ipc_call_t *call,
+    ipc_call_t *answer, size_t *answer_count)
 {
         measured_string_t *strings;
@@ -699 +507 @@
                 /* Clear the answer structure */
                 ipc_call_t answer;
-                size_t answer_count;
-                refresh_answer(&answer, &answer_count);
+                size_t count;
+                refresh_answer(&answer, &count);
                 
                 /* Fetch the next message */
@@ -707 +515 @@
                 
                 /* Process the message */
-                int res = net_module_message(callid, &call, &answer, &answer_count);
+                int res;
+                if (IS_NET_PACKET_MESSAGE(call))
+                        res = packet_server_message(callid, &call, &answer, &count);
+                else
+                        res = net_message(callid, &call, &answer, &count);
                 
                 /* End if told to either by the message or the processing result */
@@ -714 +526 @@
                 
                 /* Answer the message */
-                answer_call(callid, res, &answer, answer_count);
+                answer_call(callid, res, &answer, count);
         }
 }
@@ -720 +532 @@
 int main(int argc, char *argv[])
 {
-        return net_module_start(net_client_connection);
+        netifs_initialize(&net_globals.netifs);
+        char_map_initialize(&net_globals.netif_hwpaths);
+        modules_initialize(&net_globals.modules);
+        measured_strings_initialize(&net_globals.configuration);
+        async_set_client_connection(net_client_connection);
+        
+        int rc = pm_init();
+        if (rc != EOK) {
+                printf("%s: Unable to initialize packet management\n", NAME);
+                return rc;
+        }
+        
+        rc = packet_server_init();
+        if (rc != EOK) {
+                printf("%s: Unable to initialize packet server\n", NAME);
+                pm_destroy();
+                return rc;
+        }
+        
+        rc = read_configuration();
+        if (rc != EOK) {
+                printf("%s: Error reading configuration\n", NAME);
+                pm_destroy();
+                return rc;
+        }
+        
+        DIR *config_dir = opendir(CONF_DIR);
+        if (config_dir != NULL) {
+                struct dirent *dir_entry;
+                while ((dir_entry = readdir(config_dir))) {
+                        /* Ignore files without the CONF_EXT extension */
+                        if ((str_size(dir_entry->d_name) < str_size(CONF_EXT)) ||
+                            (str_cmp(dir_entry->d_name + str_size(dir_entry->d_name) -
+                            str_size(CONF_EXT), CONF_EXT) != 0))
+                                continue;
+                        
+                        
+                        netif_t *netif = (netif_t *) malloc(sizeof(netif_t));
+                        if (!netif)
+                                continue;
+                        
+                        netif->handle = -1;
+                        netif->sess = NULL;
+                        
+                        netif->id = generate_new_device_id();
+                        if (!netif->id) {
+                                free(netif);
+                                continue;
+                        }
+                        
+                        rc = measured_strings_initialize(&netif->configuration);
+                        if (rc != EOK) {
+                                free(netif);
+                                continue;
+                        }
+                        
+                        rc = read_netif_configuration(dir_entry->d_name, netif);
+                        if (rc != EOK) {
+                                printf("%s: Error reading configuration %s\n", NAME,
+                                    dir_entry->d_name);
+                                free(netif);
+                                continue;
+                        }
+                        
+                        measured_string_t *name = measured_strings_find(&netif->configuration,
+                            (uint8_t *) CONF_NAME, 0);
+                        if (!name) {
+                                printf("%s: Network interface name is missing in %s\n",
+                                    NAME, dir_entry->d_name);
+                                measured_strings_destroy(&netif->configuration, free);
+                                free(netif);
+                                continue;
+                        }
+                        
+                        netif->name = name->value;
+                        
+                        /* Mandatory hardware path */
+                        measured_string_t *hwpath = measured_strings_find(
+                            &netif->configuration, (const uint8_t *) CONF_HWPATH, 0);
+                        if (!hwpath) {
+                                printf("%s: Hardware path is missing in %s\n",
+                                    NAME, dir_entry->d_name);
+                                measured_strings_destroy(&netif->configuration, free);
+                                free(netif);
+                                continue;
+                        }
+                        
+                        int index = netifs_add(&net_globals.netifs, netif->id, netif);
+                        if (index < 0) {
+                                measured_strings_destroy(&netif->configuration, free);
+                                free(netif);
+                                continue;
+                        }
+                        
+                        /*
+                         * Add to the hardware paths map and init network interfaces
+                         * and needed modules.
+                         */
+                        rc = char_map_add(&net_globals.netif_hwpaths, hwpath->value, 0, index);
+                        if (rc != EOK) {
+                                measured_strings_destroy(&netif->configuration, free);
+                                netifs_exclude_index(&net_globals.netifs, index, free);
+                                continue;
+                        }
+                }
+                
+                closedir(config_dir);
+        }
+        
+        rc = add_module(NULL, &net_globals.modules, (uint8_t *) ETHERNET_NAME,
+            (uint8_t *) ETHERNET_FILENAME, SERVICE_ETHERNET, 0, connect_to_service);
+        if (rc != EOK) {
+                printf("%s: Error adding module '%s'\n", NAME, ETHERNET_NAME);
+                pm_destroy();
+                return rc;
+        }
+        
+        rc = add_module(NULL, &net_globals.modules, (uint8_t *) NILDUMMY_NAME,
+            (uint8_t *) NILDUMMY_FILENAME, SERVICE_NILDUMMY, 0, connect_to_service);
+        if (rc != EOK) {
+                printf("%s: Error adding module '%s'\n", NAME, NILDUMMY_NAME);
+                pm_destroy();
+                return rc;
+        }
+        
+        task_id_t task_id = net_spawn((uint8_t *) IP_FILENAME);
+        if (!task_id) {
+                printf("%s: Error spawning IP module\n", NAME);
+                pm_destroy();
+                return EINVAL;
+        }
+        
+        rc = add_module(NULL, &net_globals.modules, (uint8_t *) IP_NAME,
+            (uint8_t *) IP_FILENAME, SERVICE_IP, task_id, ip_connect_module);
+        if (rc != EOK) {
+                printf("%s: Error adding module '%s'\n", NAME, IP_NAME);
+                pm_destroy();
+                return rc;
+        }
+        
+        if (!net_spawn((uint8_t *) "/srv/icmp")) {
+                printf("%s: Error spawning ICMP module\n", NAME);
+                pm_destroy();
+                return EINVAL;
+        }
+        
+        if (!net_spawn((uint8_t *) "/srv/udp")) {
+                printf("%s: Error spawning UDP module\n", NAME);
+                pm_destroy();
+                return EINVAL;
+        }
+        
+        if (!net_spawn((uint8_t *) "/srv/tcp")) {
+                printf("%s: Error spawning TCP module\n", NAME);
+                pm_destroy();
+                return EINVAL;
+        }
+        
+        rc = service_register(SERVICE_NETWORKING);
+        if (rc != EOK) {
+                printf("%s: Error registering service\n", NAME);
+                pm_destroy();
+                return rc;
+        }
+        
+        task_retval(0);
+        async_manager();
+        return 0;
 }
 

uspace/srv/net/net/net.h

@@ -32 +32 @@
  */
 
-/** @file
- * Networking subsystem central module.
- *
- */
-
 #ifndef NET_NET_H_
 #define NET_NET_H_
@@ -48 +43 @@
 #include <devman.h>
 
-/** @name Modules definitions
- * @{
- */
+#define NAME  "net"
 
 #define ETHERNET_FILENAME  "/srv/eth"
@@ -95 +88 @@
  */
 typedef struct {
-        uint8_t *name;                          /**< System-unique network interface name. */
-        nic_device_id_t id;             /**< System-unique network interface identifier. */
-        measured_strings_t configuration;  /**< Configuration. */
+        /** System-unique network interface name. */
+        uint8_t *name;
+        /** System-unique network interface identifier. */
+        nic_device_id_t id;
+        /** Configuration. */
+        measured_strings_t configuration;
         
         /** Serving network interface driver module index. */
-        devman_handle_t handle;         /**< Handle for devman */
-        async_sess_t *sess;                     /**< Driver session. */
+        devman_handle_t handle;  /**< Handle for devman */
+        async_sess_t *sess;      /**< Driver session. */
         
-        module_t *nil;   /**< Serving link layer module index. */
-        module_t *il;    /**< Serving internet layer module index. */
+        module_t *nil;  /**< Serving link layer module index. */
+        module_t *il;   /**< Serving internet layer module index. */
 } netif_t;
 
@@ -129 +125 @@
 } net_globals_t;
 
-extern int add_configuration(measured_strings_t *, const uint8_t *,
-    const uint8_t *);
-extern int net_module_message(ipc_callid_t, ipc_call_t *, ipc_call_t *, size_t *);
-extern int net_initialize_build(async_client_conn_t);
-extern int net_message(ipc_callid_t, ipc_call_t *, ipc_call_t *, size_t *);
-
 #endif
 

uspace/srv/net/net/packet_server.h

@@ -43 +43 @@
  */
 
-#ifndef LIBPACKET_PACKET_SERVER_H_
-#define LIBPACKET_PACKET_SERVER_H_
+#ifndef NET_PACKET_SERVER_H_
+#define NET_PACKET_SERVER_H_
 
 #include <ipc/common.h>

uspace/srv/net/nil/eth/eth.c

@@ -629 +629 @@
         }
         
-        printf("%s: Protocol registered (protocol: %d, service: %d)\n",
+        printf("%s: Protocol registered (protocol: %d, service: %#x)\n",
             NAME, proto->protocol, proto->service);
         

uspace/srv/net/nil/nildummy/nildummy.c

@@ -324 +324 @@
         nildummy_globals.proto.sess = sess;
         
-        printf("%s: Protocol registered (service: %d)\n",
+        printf("%s: Protocol registered (service: %#x)\n",
             NAME, nildummy_globals.proto.service);