Changeset 6a44ee4 in mainline for uspace/srv/net/nil/nildummy/nildummy.c

Timestamp:

2011-07-20T15:26:21Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

efcebe1

Parents:

25bef0ff (diff), a701812 (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/nil/nildummy/nildummy.c (modified) (16 diffs)

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

@@ -44 +44 @@
 #include <ipc/net.h>
 #include <ipc/services.h>
-
 #include <net/modules.h>
 #include <net/device.h>
@@ -53 +52 @@
 #include <netif_remote.h>
 #include <nil_skel.h>
-
 #include "nildummy.h"
 
@@ -67 +65 @@
 DEVICE_MAP_IMPLEMENT(nildummy_devices, nildummy_device_t);
 
-int nil_device_state_msg_local(int nil_phone, device_id_t device_id, int state)
+int nil_device_state_msg_local(device_id_t device_id, sysarg_t state)
 {
         fibril_rwlock_read_lock(&nildummy_globals.protos_lock);
-        if (nildummy_globals.proto.phone)
-                il_device_state_msg(nildummy_globals.proto.phone, device_id,
+        if (nildummy_globals.proto.sess)
+                il_device_state_msg(nildummy_globals.proto.sess, device_id,
                     state, nildummy_globals.proto.service);
         fibril_rwlock_read_unlock(&nildummy_globals.protos_lock);
@@ -78 +76 @@
 }
 
-int nil_initialize(int net_phone)
+int nil_initialize(async_sess_t *sess)
 {
         fibril_rwlock_initialize(&nildummy_globals.devices_lock);
@@ -85 +83 @@
         fibril_rwlock_write_lock(&nildummy_globals.protos_lock);
         
-        nildummy_globals.net_phone = net_phone;
-        nildummy_globals.proto.phone = 0;
+        nildummy_globals.net_sess = sess;
+        nildummy_globals.proto.sess = NULL;
         int rc = nildummy_devices_initialize(&nildummy_globals.devices);
         
@@ -99 +97 @@
  * @param[in]     iid   Message identifier.
  * @param[in,out] icall Message parameters.
- *
- */
-static void nildummy_receiver(ipc_callid_t iid, ipc_call_t *icall)
+ * @param[in]     arg    Local argument.
+ *
+ */
+static void nildummy_receiver(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
         packet_t *packet;
@@ -109 +108 @@
                 switch (IPC_GET_IMETHOD(*icall)) {
                 case NET_NIL_DEVICE_STATE:
-                        rc = nil_device_state_msg_local(0,
-                            IPC_GET_DEVICE(*icall), IPC_GET_STATE(*icall));
+                        rc = nil_device_state_msg_local(IPC_GET_DEVICE(*icall),
+                            IPC_GET_STATE(*icall));
                         async_answer_0(iid, (sysarg_t) rc);
                         break;
                 
                 case NET_NIL_RECEIVED:
-                        rc = packet_translate_remote(nildummy_globals.net_phone,
+                        rc = packet_translate_remote(nildummy_globals.net_sess,
                             &packet, IPC_GET_PACKET(*icall));
                         if (rc == EOK)
-                                rc = nil_received_msg_local(0,
-                                    IPC_GET_DEVICE(*icall), packet, 0);
+                                rc = nil_received_msg_local(IPC_GET_DEVICE(*icall),
+                                    packet, 0);
                         
                         async_answer_0(iid, (sysarg_t) rc);
@@ -177 +176 @@
                 /* Notify the upper layer module */
                 fibril_rwlock_read_lock(&nildummy_globals.protos_lock);
-                if (nildummy_globals.proto.phone) {
-                        il_mtu_changed_msg(nildummy_globals.proto.phone,
+                if (nildummy_globals.proto.sess) {
+                        il_mtu_changed_msg(nildummy_globals.proto.sess,
                             device->device_id, device->mtu,
                             nildummy_globals.proto.service);
@@ -200 +199 @@
 
         /* Bind the device driver */
-        device->phone = netif_bind_service(device->service, device->device_id,
+        device->sess = netif_bind_service(device->service, device->device_id,
             SERVICE_ETHERNET, nildummy_receiver);
-        if (device->phone < 0) {
+        if (device->sess == NULL) {
                 fibril_rwlock_write_unlock(&nildummy_globals.devices_lock);
                 free(device);
-                return device->phone;
+                return ENOENT;
         }
         
         /* Get hardware address */
-        int rc = netif_get_addr_req(device->phone, device->device_id,
+        int rc = netif_get_addr_req(device->sess, device->device_id,
             &device->addr, &device->addr_data);
         if (rc != EOK) {
@@ -304 +303 @@
 }
 
-int nil_received_msg_local(int nil_phone, device_id_t device_id,
-    packet_t *packet, services_t target)
+int nil_received_msg_local(device_id_t device_id, packet_t *packet,
+    services_t target)
 {
         fibril_rwlock_read_lock(&nildummy_globals.protos_lock);
         
-        if (nildummy_globals.proto.phone) {
+        if (nildummy_globals.proto.sess) {
                 do {
                         packet_t *next = pq_detach(packet);
-                        il_received_msg(nildummy_globals.proto.phone, device_id,
+                        il_received_msg(nildummy_globals.proto.sess, device_id,
                             packet, nildummy_globals.proto.service);
                         packet = next;
@@ -328 +327 @@
  *
  * @param[in] service Module service.
- * @param[in] phone   Service phone.
+ * @param[in] sess    Service session.
  *
  * @return EOK on success.
@@ -335 +334 @@
  *
  */
-static int nildummy_register_message(services_t service, int phone)
+static int nildummy_register_message(services_t service, async_sess_t *sess)
 {
         fibril_rwlock_write_lock(&nildummy_globals.protos_lock);
         nildummy_globals.proto.service = service;
-        nildummy_globals.proto.phone = phone;
-        
-        printf("%s: Protocol registered (service: %d, phone: %d)\n",
-            NAME, nildummy_globals.proto.service, nildummy_globals.proto.phone);
+        nildummy_globals.proto.sess = sess;
+        
+        printf("%s: Protocol registered (service: %d)\n",
+            NAME, nildummy_globals.proto.service);
         
         fibril_rwlock_write_unlock(&nildummy_globals.protos_lock);
@@ -373 +372 @@
         /* Send packet queue */
         if (packet)
-                netif_send_msg(device->phone, device_id, packet,
+                netif_send_msg(device->sess, device_id, packet,
                     SERVICE_NILDUMMY);
         
@@ -393 +392 @@
         
         *answer_count = 0;
+        
+        if (!IPC_GET_IMETHOD(*call))
+                return EOK;
+        
+        async_sess_t *callback =
+            async_callback_receive_start(EXCHANGE_SERIALIZE, call);
+        if (callback)
+                return nildummy_register_message(NIL_GET_PROTO(*call), callback);
+        
         switch (IPC_GET_IMETHOD(*call)) {
-        case IPC_M_PHONE_HUNGUP:
-                return EOK;
-        
         case NET_NIL_DEVICE:
                 return nildummy_device_message(IPC_GET_DEVICE(*call),
@@ -402 +407 @@
         
         case NET_NIL_SEND:
-                rc = packet_translate_remote(nildummy_globals.net_phone,
+                rc = packet_translate_remote(nildummy_globals.net_sess,
                     &packet, IPC_GET_PACKET(*call));
                 if (rc != EOK)
@@ -432 +437 @@
                         return rc;
                 return measured_strings_reply(address, 1);
-        
-        case IPC_M_CONNECT_TO_ME:
-                return nildummy_register_message(NIL_GET_PROTO(*call),
-                    IPC_GET_PHONE(*call));
         }