Changes in uspace/srv/net/net/net.c [ffa2c8ef:5fe7692] in mainline

File:

• uspace/srv/net/net/net.c (modified) (6 diffs)

uspace/srv/net/net/net.c

@@ -289 +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);
@@ -552 +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;
@@ -562 +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;
@@ -571 +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;
@@ -583 +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;
                 }
@@ -590 +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;
                 }