Changes in uspace/srv/net/nil/nildummy/nildummy.c [3cd95ef:ffa2c8ef] in mainline

File:

• uspace/srv/net/nil/nildummy/nildummy.c (modified) (17 diffs)

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

@@ -41 +41 @@
 #include <stdio.h>
 #include <str.h>
-#include <err.h>
-#include <ipc/ipc.h>
+#include <ipc/nil.h>
 #include <ipc/net.h>
 #include <ipc/services.h>
@@ -48 +47 @@
 #include <net/modules.h>
 #include <net/device.h>
-#include <netif_interface.h>
-#include <nil_interface.h>
-#include <il_interface.h>
+#include <il_remote.h>
 #include <adt/measured_strings.h>
 #include <net/packet.h>
 #include <packet_remote.h>
-#include <nil_local.h>
+#include <netif_remote.h>
+#include <nil_skel.h>
 
 #include "nildummy.h"
@@ -82 +80 @@
 int nil_initialize(int net_phone)
 {
-        ERROR_DECLARE;
-        
         fibril_rwlock_initialize(&nildummy_globals.devices_lock);
         fibril_rwlock_initialize(&nildummy_globals.protos_lock);
@@ -91 +87 @@
         nildummy_globals.net_phone = net_phone;
         nildummy_globals.proto.phone = 0;
-        ERROR_CODE = nildummy_devices_initialize(&nildummy_globals.devices);
+        int rc = nildummy_devices_initialize(&nildummy_globals.devices);
         
         fibril_rwlock_write_unlock(&nildummy_globals.protos_lock);
         fibril_rwlock_write_unlock(&nildummy_globals.devices_lock);
         
-        return ERROR_CODE;
-}
-
-/** Process IPC messages from the registered device driver modules in an
- * infinite loop.
- *
- * @param[in] iid       The message identifier.
- * @param[in,out]       icall The message parameters.
+        return rc;
+}
+
+/** Process IPC messages from the registered device driver modules
+ *
+ * @param[in]     iid   Message identifier.
+ * @param[in,out] icall Message parameters.
+ *
  */
 static void nildummy_receiver(ipc_callid_t iid, ipc_call_t *icall)
 {
-        ERROR_DECLARE;
-
-        packet_t packet;
-
+        packet_t *packet;
+        int rc;
+        
         while (true) {
-                switch (IPC_GET_METHOD(*icall)) {
+                switch (IPC_GET_IMETHOD(*icall)) {
                 case NET_NIL_DEVICE_STATE:
-                        ERROR_CODE = nil_device_state_msg_local(0,
-                            IPC_GET_DEVICE(icall), IPC_GET_STATE(icall));
-                        ipc_answer_0(iid, (ipcarg_t) ERROR_CODE);
+                        rc = nil_device_state_msg_local(0,
+                            IPC_GET_DEVICE(*icall), IPC_GET_STATE(*icall));
+                        async_answer_0(iid, (sysarg_t) rc);
                         break;
                 
                 case NET_NIL_RECEIVED:
-                        if (ERROR_NONE(packet_translate_remote(
-                            nildummy_globals.net_phone, &packet,
-                            IPC_GET_PACKET(icall)))) {
-                                ERROR_CODE = nil_received_msg_local(0,
-                                    IPC_GET_DEVICE(icall), packet, 0);
-                        }
-                        ipc_answer_0(iid, (ipcarg_t) ERROR_CODE);
+                        rc = packet_translate_remote(nildummy_globals.net_phone,
+                            &packet, IPC_GET_PACKET(*icall));
+                        if (rc == EOK)
+                                rc = nil_received_msg_local(0,
+                                    IPC_GET_DEVICE(*icall), packet, 0);
+                        
+                        async_answer_0(iid, (sysarg_t) rc);
                         break;
                 
                 default:
-                        ipc_answer_0(iid, (ipcarg_t) ENOTSUP);
+                        async_answer_0(iid, (sysarg_t) ENOTSUP);
                 }
                 
@@ -141 +136 @@
  * Determine the device local hardware address.
  *
- * @param[in] device_id The new device identifier.
- * @param[in] service   The device driver service.
- * @param[in] mtu       The device maximum transmission unit.
- * @returns             EOK on success.
- * @returns             EEXIST if the device with the different service exists.
- * @returns             ENOMEM if there is not enough memory left.
- * @returns             Other error codes as defined for the
- *                      netif_bind_service() function.
- * @returns             Other error codes as defined for the
- *                      netif_get_addr_req() function.
- */
-static int
-nildummy_device_message(device_id_t device_id, services_t service, size_t mtu)
-{
-        ERROR_DECLARE;
-
-        nildummy_device_ref device;
-        int index;
-
+ * @param[in] device_id New device identifier.
+ * @param[in] service   Device driver service.
+ * @param[in] mtu       Device maximum transmission unit.
+ *
+ * @return EOK on success.
+ * @return EEXIST if the device with the different service exists.
+ * @return ENOMEM if there is not enough memory left.
+ * @return Other error codes as defined for the
+ *         netif_bind_service() function.
+ * @return Other error codes as defined for the
+ *         netif_get_addr_req() function.
+ *
+ */
+static int nildummy_device_message(device_id_t device_id, services_t service,
+    size_t mtu)
+{
         fibril_rwlock_write_lock(&nildummy_globals.devices_lock);
-
-        // an existing device?
-        device = nildummy_devices_find(&nildummy_globals.devices, device_id);
+        
+        /* An existing device? */
+        nildummy_device_t *device =
+            nildummy_devices_find(&nildummy_globals.devices, device_id);
         if (device) {
                 if (device->service != service) {
@@ -172 +165 @@
                 }
                 
-                // update mtu
+                /* Update MTU */
                 if (mtu > 0)
                         device->mtu = mtu;
@@ -178 +171 @@
                         device->mtu = NET_DEFAULT_MTU;
                 
-                printf("Device %d already exists:\tMTU\t= %d\n",
+                printf("Device %d already exists:\tMTU\t= %zu\n",
                     device->device_id, device->mtu);
                 fibril_rwlock_write_unlock(&nildummy_globals.devices_lock);
                 
-                // notify the upper layer module
+                /* Notify the upper layer module */
                 fibril_rwlock_read_lock(&nildummy_globals.protos_lock);
                 if (nildummy_globals.proto.phone) {
@@ -194 +187 @@
         }
         
-        // create a new device
-        device = (nildummy_device_ref) malloc(sizeof(nildummy_device_t));
+        /* Create a new device */
+        device = (nildummy_device_t *) malloc(sizeof(nildummy_device_t));
         if (!device)
                 return ENOMEM;
@@ -206 +199 @@
                 device->mtu = NET_DEFAULT_MTU;
 
-        // bind the device driver
+        /* Bind the device driver */
         device->phone = netif_bind_service(device->service, device->device_id,
             SERVICE_ETHERNET, nildummy_receiver);
@@ -215 +208 @@
         }
         
-        // get hardware address
-        if (ERROR_OCCURRED(netif_get_addr_req(device->phone, device->device_id,
-            &device->addr, &device->addr_data))) {
+        /* Get hardware address */
+        int rc = netif_get_addr_req(device->phone, device->device_id,
+            &device->addr, &device->addr_data);
+        if (rc != EOK) {
                 fibril_rwlock_write_unlock(&nildummy_globals.devices_lock);
                 free(device);
-                return ERROR_CODE;
-        }
-        
-        // add to the cache
-        index = nildummy_devices_add(&nildummy_globals.devices,
+                return rc;
+        }
+        
+        /* Add to the cache */
+        int index = nildummy_devices_add(&nildummy_globals.devices,
             device->device_id, device);
         if (index < 0) {
@@ -234 +228 @@
         }
         
-        printf("%s: Device registered (id: %d, service: %d, mtu: %d)\n",
+        printf("%s: Device registered (id: %d, service: %d, mtu: %zu)\n",
             NAME, device->device_id, device->service, device->mtu);
         fibril_rwlock_write_unlock(&nildummy_globals.devices_lock);
@@ -242 +236 @@
 /** Return the device hardware address.
  *
- * @param[in] device_id The device identifier.
- * @param[out] address  The device hardware address.
- * @return               EOK on success.
- * @return              EBADMEM if the address parameter is NULL.
- * @return              ENOENT if there no such device.
- *
- */
-static int
-nildummy_addr_message(device_id_t device_id, measured_string_ref *address)
-{
-        nildummy_device_ref device;
-
+ * @param[in]  device_id Device identifier.
+ * @param[out] address   Device hardware address.
+ *
+ * @return EOK on success.
+ * @return EBADMEM if the address parameter is NULL.
+ * @return ENOENT if there no such device.
+ *
+ */
+static int nildummy_addr_message(device_id_t device_id,
+    measured_string_t **address)
+{
         if (!address)
                 return EBADMEM;
         
         fibril_rwlock_read_lock(&nildummy_globals.devices_lock);
-        device = nildummy_devices_find(&nildummy_globals.devices, device_id);
+        
+        nildummy_device_t *device =
+            nildummy_devices_find(&nildummy_globals.devices, device_id);
         if (!device) {
                 fibril_rwlock_read_unlock(&nildummy_globals.devices_lock);
                 return ENOENT;
         }
+        
         *address = device->addr;
+        
         fibril_rwlock_read_unlock(&nildummy_globals.devices_lock);
         
@@ -271 +268 @@
 /** Return the device packet dimensions for sending.
  *
- * @param[in] device_id The device identifier.
- * @param[out] addr_len The minimum reserved address length.
- * @param[out] prefix   The minimum reserved prefix size.
- * @param[out] content  The maximum content size.
- * @param[out] suffix   The minimum reserved suffix size.
- * @return              EOK on success.
- * @return              EBADMEM if either one of the parameters is NULL.
- * @return              ENOENT if there is no such device.
- *
- */
-static int
-nildummy_packet_space_message(device_id_t device_id, size_t *addr_len,
+ * @param[in]  device_id Device identifier.
+ * @param[out] addr_len  Minimum reserved address length.
+ * @param[out] prefix    Minimum reserved prefix size.
+ * @param[out] content   Maximum content size.
+ * @param[out] suffix    Minimum reserved suffix size.
+ *
+ * @return EOK on success.
+ * @return EBADMEM if either one of the parameters is NULL.
+ * @return ENOENT if there is no such device.
+ *
+ */
+static int nildummy_packet_space_message(device_id_t device_id, size_t *addr_len,
     size_t *prefix, size_t *content, size_t *suffix)
 {
-        nildummy_device_ref device;
-
-        if (!addr_len || !prefix || !content || !suffix)
+        if ((!addr_len) || (!prefix) || (!content) || (!suffix))
                 return EBADMEM;
         
         fibril_rwlock_read_lock(&nildummy_globals.devices_lock);
-        device = nildummy_devices_find(&nildummy_globals.devices, device_id);
+        
+        nildummy_device_t *device =
+            nildummy_devices_find(&nildummy_globals.devices, device_id);
         if (!device) {
                 fibril_rwlock_read_unlock(&nildummy_globals.devices_lock);
                 return ENOENT;
         }
+        
         *content = device->mtu;
+        
         fibril_rwlock_read_unlock(&nildummy_globals.devices_lock);
         
@@ -305 +304 @@
 }
 
-int
-nil_received_msg_local(int nil_phone, device_id_t device_id, packet_t packet,
-    services_t target)
-{
-        packet_t next;
-
+int nil_received_msg_local(int nil_phone, device_id_t device_id,
+    packet_t *packet, services_t target)
+{
         fibril_rwlock_read_lock(&nildummy_globals.protos_lock);
+        
         if (nildummy_globals.proto.phone) {
                 do {
-                        next = pq_detach(packet);
+                        packet_t *next = pq_detach(packet);
                         il_received_msg(nildummy_globals.proto.phone, device_id,
                             packet, nildummy_globals.proto.service);
                         packet = next;
-                } while(packet);
-        }
+                } while (packet);
+        }
+        
         fibril_rwlock_read_unlock(&nildummy_globals.protos_lock);
         
@@ -329 +327 @@
  * Pass received packets for this service.
  *
- * @param[in] service   The module service.
- * @param[in] phone     The service phone.
- * @return              EOK on success.
- * @return              ENOENT if the service is not known.
- * @return              ENOMEM if there is not enough memory left.
+ * @param[in] service Module service.
+ * @param[in] phone   Service phone.
+ *
+ * @return EOK on success.
+ * @return ENOENT if the service is not known.
+ * @return ENOMEM if there is not enough memory left.
+ *
  */
 static int nildummy_register_message(services_t service, int phone)
@@ -350 +350 @@
 /** Send the packet queue.
  *
- * @param[in] device_id The device identifier.
- * @param[in] packet    The packet queue.
- * @param[in] sender    The sending module service.
- * @return              EOK on success.
- * @return              ENOENT if there no such device.
- * @return              EINVAL if the service parameter is not known.
- */
-static int
-nildummy_send_message(device_id_t device_id, packet_t packet, services_t sender)
-{
-        nildummy_device_ref device;
-
+ * @param[in] device_id Device identifier.
+ * @param[in] packet    Packet queue.
+ * @param[in] sender    Sending module service.
+ *
+ * @return EOK on success.
+ * @return ENOENT if there no such device.
+ * @return EINVAL if the service parameter is not known.
+ *
+ */
+static int nildummy_send_message(device_id_t device_id, packet_t *packet,
+    services_t sender)
+{
         fibril_rwlock_read_lock(&nildummy_globals.devices_lock);
-        device = nildummy_devices_find(&nildummy_globals.devices, device_id);
+        
+        nildummy_device_t *device =
+            nildummy_devices_find(&nildummy_globals.devices, device_id);
         if (!device) {
                 fibril_rwlock_read_unlock(&nildummy_globals.devices_lock);
                 return ENOENT;
         }
-        // send packet queue
+        
+        /* Send packet queue */
         if (packet)
                 netif_send_msg(device->phone, device_id, packet,
                     SERVICE_NILDUMMY);
+        
         fibril_rwlock_read_unlock(&nildummy_globals.devices_lock);
-        return EOK;
-}
-
-int
-nil_message_standalone(const char *name, ipc_callid_t callid, ipc_call_t *call,
-    ipc_call_t *answer, int *answer_count)
-{
-        ERROR_DECLARE;
-        
-        measured_string_ref address;
-        packet_t packet;
+        
+        return EOK;
+}
+
+int nil_module_message(ipc_callid_t callid, ipc_call_t *call,
+    ipc_call_t *answer, size_t *answer_count)
+{
+        measured_string_t *address;
+        packet_t *packet;
         size_t addrlen;
         size_t prefix;
         size_t suffix;
         size_t content;
+        int rc;
         
         *answer_count = 0;
-        switch (IPC_GET_METHOD(*call)) {
+        switch (IPC_GET_IMETHOD(*call)) {
         case IPC_M_PHONE_HUNGUP:
                 return EOK;
         
         case NET_NIL_DEVICE:
-                return nildummy_device_message(IPC_GET_DEVICE(call),
-                    IPC_GET_SERVICE(call), IPC_GET_MTU(call));
+                return nildummy_device_message(IPC_GET_DEVICE(*call),
+                    IPC_GET_SERVICE(*call), IPC_GET_MTU(*call));
         
         case NET_NIL_SEND:
-                ERROR_PROPAGATE(packet_translate_remote(
-                    nildummy_globals.net_phone, &packet, IPC_GET_PACKET(call)));
-                return nildummy_send_message(IPC_GET_DEVICE(call), packet,
-                    IPC_GET_SERVICE(call));
+                rc = packet_translate_remote(nildummy_globals.net_phone,
+                    &packet, IPC_GET_PACKET(*call));
+                if (rc != EOK)
+                        return rc;
+                return nildummy_send_message(IPC_GET_DEVICE(*call), packet,
+                    IPC_GET_SERVICE(*call));
         
         case NET_NIL_PACKET_SPACE:
-                ERROR_PROPAGATE(nildummy_packet_space_message(
-                    IPC_GET_DEVICE(call), &addrlen, &prefix, &content,
-                    &suffix));
-                IPC_SET_ADDR(answer, addrlen);
-                IPC_SET_PREFIX(answer, prefix);
-                IPC_SET_CONTENT(answer, content);
-                IPC_SET_SUFFIX(answer, suffix);
+                rc = nildummy_packet_space_message(IPC_GET_DEVICE(*call),
+                    &addrlen, &prefix, &content, &suffix);
+                if (rc != EOK)
+                        return rc;
+                IPC_SET_ADDR(*answer, addrlen);
+                IPC_SET_PREFIX(*answer, prefix);
+                IPC_SET_CONTENT(*answer, content);
+                IPC_SET_SUFFIX(*answer, suffix);
                 *answer_count = 4;
                 return EOK;
         
         case NET_NIL_ADDR:
-                ERROR_PROPAGATE(nildummy_addr_message(IPC_GET_DEVICE(call),
-                    &address));
+                rc = nildummy_addr_message(IPC_GET_DEVICE(*call), &address);
+                if (rc != EOK)
+                        return rc;
                 return measured_strings_reply(address, 1);
         
         case NET_NIL_BROADCAST_ADDR:
-                ERROR_PROPAGATE(nildummy_addr_message(IPC_GET_DEVICE(call),
-                    &address));
+                rc = nildummy_addr_message(IPC_GET_DEVICE(*call), &address);
+                if (rc != EOK)
+                        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));
+                return nildummy_register_message(NIL_GET_PROTO(*call),
+                    IPC_GET_PHONE(*call));
         }
         
@@ -433 +441 @@
 }
 
-/** Default thread for new connections.
- *
- * @param[in] iid       The initial message identifier.
- * @param[in] icall     The initial message call structure.
- */
-static void nil_client_connection(ipc_callid_t iid, ipc_call_t *icall)
-{
-        /*
-         * Accept the connection
-         *  - Answer the first IPC_M_CONNECT_ME_TO call.
-         */
-        ipc_answer_0(iid, EOK);
-        
-        while (true) {
-                ipc_call_t answer;
-                int answer_count;
-                
-                /* Clear the answer structure */
-                refresh_answer(&answer, &answer_count);
-                
-                /* Fetch the next message */
-                ipc_call_t call;
-                ipc_callid_t callid = async_get_call(&call);
-                
-                /* Process the message */
-                int res = nil_module_message_standalone(NAME, callid, &call,
-                    &answer, &answer_count);
-                
-                /*
-                 * End if told to either by the message or the processing
-                 * result.
-                 */
-                if ((IPC_GET_METHOD(call) == IPC_M_PHONE_HUNGUP) ||
-                    (res == EHANGUP))
-                        return;
-                
-                /* Answer the message */
-                answer_call(callid, res, &answer, answer_count);
-        }
-}
-
 int main(int argc, char *argv[])
 {
-        ERROR_DECLARE;
-        
         /* Start the module */
-        ERROR_PROPAGATE(nil_module_start_standalone(nil_client_connection));
-        return EOK;
+        return nil_module_start(SERVICE_NILDUMMY);
 }