Changeset 8b655705 in mainline for uspace/srv/net/net/net.c

Timestamp:

2011-04-15T19:38:07Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9dd730d1

Parents:

6b9e85b (diff), b2fb47f (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/srv/net/net/net.c (modified) (10 diffs)

uspace/srv/net/net/net.c

@@ -47 +47 @@
 #include <str_error.h>
 
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <ipc/net.h>
@@ -290 +289 @@
         if (rc != EOK)
                 return rc;
+        
         rc = add_module(NULL, &net_globals.modules, (uint8_t *) NE2000_NAME,
             (uint8_t *) NE2000_FILENAME, SERVICE_NE2000, 0, connect_to_service);
         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);
@@ -326 +328 @@
 static int net_module_start(async_client_conn_t client_connection)
 {
-        sysarg_t phonehash;
         int rc;
         
@@ -338 +339 @@
                 goto out;
         
-        rc = ipc_connect_to_me(PHONE_NS, SERVICE_NETWORKING, 0, 0, &phonehash);
+        rc = async_connect_to_me(PHONE_NS, SERVICE_NETWORKING, 0, 0, NULL);
         if (rc != EOK)
                 goto out;
@@ -554 +555 @@
                 rc = read_netif_configuration(conf_files[i], netif);
                 if (rc != EOK) {
-                        measured_strings_destroy(&netif->configuration);
+                        measured_strings_destroy(&netif->configuration, free);
                         free(netif);
                         return rc;
@@ -564 +565 @@
                 if (!setting) {
                         fprintf(stderr, "%s: Network interface name is missing\n", NAME);
-                        measured_strings_destroy(&netif->configuration);
+                        measured_strings_destroy(&netif->configuration, free);
                         free(netif);
                         return EINVAL;
@@ -573 +574 @@
                 int index = netifs_add(&net_globals.netifs, netif->id, netif);
                 if (index < 0) {
-                        measured_strings_destroy(&netif->configuration);
+                        measured_strings_destroy(&netif->configuration, free);
                         free(netif);
                         return index;
@@ -585 +586 @@
                     index);
                 if (rc != EOK) {
-                        measured_strings_destroy(&netif->configuration);
-                        netifs_exclude_index(&net_globals.netifs, index);
+                        measured_strings_destroy(&netif->configuration, free);
+                        netifs_exclude_index(&net_globals.netifs, index, free);
                         return rc;
                 }
@@ -592 +593 @@
                 rc = start_device(netif);
                 if (rc != EOK) {
-                        printf("%s: Error starting interface %s (%s)\n", NAME,
+                        printf("%s: Ignoring failed interface %s (%s)\n", NAME,
                             netif->name, str_error(rc));
-                        measured_strings_destroy(&netif->configuration);
-                        netifs_exclude_index(&net_globals.netifs, index);
-                        
-                        return rc;
+                        measured_strings_destroy(&netif->configuration, free);
+                        netifs_exclude_index(&net_globals.netifs, index, free);
+                        continue;
                 }
                 
@@ -687 +687 @@
          *  - Answer the first IPC_M_CONNECT_ME_TO call.
          */
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
         
         while (true) {