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

File:

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

uspace/srv/net/net/net.c

@@ -36 +36 @@
  */
 
-#include "net.h"
-
 #include <async.h>
 #include <ctype.h>
@@ -46 +44 @@
 #include <str.h>
 #include <str_error.h>
-
+#include <ns.h>
 #include <ipc/services.h>
 #include <ipc/net.h>
@@ -52 +50 @@
 #include <ipc/il.h>
 #include <ipc/nil.h>
-
 #include <net/modules.h>
 #include <net/packet.h>
 #include <net/device.h>
-
 #include <adt/char_map.h>
 #include <adt/generic_char_map.h>
 #include <adt/measured_strings.h>
 #include <adt/module_map.h>
-
 #include <netif_remote.h>
 #include <nil_remote.h>
 #include <net_interface.h>
 #include <ip_interface.h>
+#include "net.h"
 
 /** Networking module name. */
@@ -289 +285 @@
         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);
@@ -336 +335 @@
                 goto out;
         
-        rc = async_connect_to_me(PHONE_NS, SERVICE_NETWORKING, 0, 0, NULL);
+        rc = service_register(SERVICE_NETWORKING);
         if (rc != EOK)
                 goto out;
@@ -390 +389 @@
 }
 
-int net_get_conf_req(int net_phone, measured_string_t **configuration,
+static int net_get_conf_req_local(measured_string_t **configuration,
     size_t count, uint8_t **data)
 {
@@ -399 +398 @@
 }
 
-int net_get_device_conf_req(int net_phone, device_id_t device_id,
+static int net_get_device_conf_req_local(device_id_t device_id,
     measured_string_t **configuration, size_t count, uint8_t **data)
 {
@@ -475 +474 @@
         uintptr_t io = setting ? strtol((char *) setting->value, NULL, 16) : 0;
         
-        rc = netif_probe_req(netif->driver->phone, netif->id, irq, (void *) io);
+        rc = netif_probe_req(netif->driver->sess, netif->id, irq, (void *) io);
         if (rc != EOK)
                 return rc;
@@ -488 +487 @@
                 
                 int mtu = setting ? strtol((char *) setting->value, NULL, 10) : 0;
-                
-                rc = nil_device_req(netif->nil->phone, netif->id, mtu,
+                rc = nil_device_req(netif->nil->sess, netif->id, mtu,
                     netif->driver->service);
                 if (rc != EOK)
@@ -499 +497 @@
         
         /* Inter-network layer startup */
-        switch (netif->il->service) {
-        case SERVICE_IP:
-                rc = ip_device_req(netif->il->phone, netif->id,
-                    internet_service);
-                if (rc != EOK)
-                        return rc;
-                break;
-        default:
-                return ENOENT;
-        }
-        
-        return netif_start_req(netif->driver->phone, netif->id);
+        rc = ip_device_req(netif->il->sess, netif->id, internet_service);
+        if (rc != EOK)
+                return rc;
+        
+        return netif_start_req(netif->driver->sess, netif->id);
 }
 
@@ -552 +543 @@
                 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 +553 @@
                 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 +562 @@
                 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 +574 @@
                     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 +581 @@
                 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;
                 }
                 
@@ -636 +626 @@
         
         *answer_count = 0;
+        
+        if (!IPC_GET_IMETHOD(*call))
+                return EOK;
+        
         switch (IPC_GET_IMETHOD(*call)) {
-        case IPC_M_PHONE_HUNGUP:
-                return EOK;
         case NET_NET_GET_DEVICE_CONF:
                 rc = measured_strings_receive(&strings, &data,
@@ -644 +636 @@
                 if (rc != EOK)
                         return rc;
-                net_get_device_conf_req(0, IPC_GET_DEVICE(*call), &strings,
+                net_get_device_conf_req_local(IPC_GET_DEVICE(*call), &strings,
                     IPC_GET_COUNT(*call), NULL);
                 
@@ -658 +650 @@
                 if (rc != EOK)
                         return rc;
-                net_get_conf_req(0, &strings, IPC_GET_COUNT(*call), NULL);
+                net_get_conf_req_local(&strings, IPC_GET_COUNT(*call), NULL);
                 
                 /* Strings should not contain received data anymore */
@@ -675 +667 @@
 /** Default thread for new connections.
  *
- * @param[in] iid The initial message identifier.
+ * @param[in] iid   The initial message identifier.
  * @param[in] icall The initial message call structure.
- *
- */
-static void net_client_connection(ipc_callid_t iid, ipc_call_t *icall)
+ * @param[in] arg   Local argument.
+ *
+ */
+static void net_client_connection(ipc_callid_t iid, ipc_call_t *icall,
+    void *arg)
 {
         /*
@@ -701 +695 @@
                 
                 /* End if told to either by the message or the processing result */
-                if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) || (res == EHANGUP))
+                if ((!IPC_GET_IMETHOD(call)) || (res == EHANGUP))
                         return;