Changeset c028b22 in mainline for uspace/srv/net/net/net.c

Timestamp:

2011-07-08T17:01:01Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cc1a727

Parents:

4e36219 (diff), 026793d (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) (14 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. */
@@ -339 +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;
@@ -393 +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)
 {
@@ -402 +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)
 {
@@ -478 +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;
@@ -491 +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)
@@ -502 +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);
 }
 
@@ -638 +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,
@@ -646 +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);
                 
@@ -660 +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 */
@@ -677 +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)
 {
         /*
@@ -703 +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;