Changeset 80cd7cd in mainline for uspace/srv/net/nil

Timestamp:

2011-01-13T20:58:24Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

87e373b

Parents:

eaef141 (diff), a613fea1 (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.

Location:

uspace/srv/net/nil

Files:

• eth/Makefile (modified) (1 diff)
• eth/eth.c (modified) (15 diffs)
• eth/eth.h (modified) (2 diffs)
• eth/eth_header.h (deleted)
• nildummy/Makefile (modified) (1 diff)
• nildummy/nildummy.c (modified) (21 diffs)
• nildummy/nildummy.h (modified) (4 diffs)
• nildummy/nildummy_module.c (deleted)

uspace/srv/net/nil/eth/Makefile

@@ -42 +42 @@
 
 SOURCES = \
-        eth.c \
-        eth_module.c
+        eth.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/srv/net/nil/eth/eth.c

@@ -45 +45 @@
 
 #include <ipc/ipc.h>
+#include <ipc/nil.h>
 #include <ipc/net.h>
 #include <ipc/services.h>
@@ -54 +55 @@
 #include <protocol_map.h>
 #include <net/device.h>
-#include <netif_interface.h>
+#include <netif_remote.h>
 #include <net_interface.h>
-#include <nil_interface.h>
-#include <il_interface.h>
+#include <il_remote.h>
 #include <adt/measured_strings.h>
 #include <packet_client.h>
 #include <packet_remote.h>
-#include <nil_local.h>
+#include <nil_skel.h>
 
 #include "eth.h"
-#include "eth_header.h"
 
 /** The module name. */
@@ -72 +71 @@
 #define ETH_PREFIX \
         (sizeof(eth_header_t) + sizeof(eth_header_lsap_t) + \
-        sizeof(eth_header_snap_t))
+            sizeof(eth_header_snap_t))
 
 /** Reserved packet suffix length. */
-#define ETH_SUFFIX \
-        sizeof(eth_fcs_t)
+#define ETH_SUFFIX  (sizeof(eth_fcs_t))
 
 /** Maximum packet content length. */
-#define ETH_MAX_CONTENT 1500u
+#define ETH_MAX_CONTENT  1500u
 
 /** Minimum packet content length. */
-#define ETH_MIN_CONTENT 46u
+#define ETH_MIN_CONTENT  46u
 
 /** Maximum tagged packet content length. */
 #define ETH_MAX_TAGGED_CONTENT(flags) \
         (ETH_MAX_CONTENT - \
-        ((IS_8023_2_LSAP(flags) || IS_8023_2_SNAP(flags)) ? \
-        sizeof(eth_header_lsap_t) : 0) - \
-        (IS_8023_2_SNAP(flags) ? sizeof(eth_header_snap_t) : 0))
+            ((IS_8023_2_LSAP(flags) || IS_8023_2_SNAP(flags)) ? \
+            sizeof(eth_header_lsap_t) : 0) - \
+            (IS_8023_2_SNAP(flags) ? sizeof(eth_header_snap_t) : 0))
 
 /** Minimum tagged packet content length. */
 #define ETH_MIN_TAGGED_CONTENT(flags) \
         (ETH_MIN_CONTENT - \
-        ((IS_8023_2_LSAP(flags) || IS_8023_2_SNAP(flags)) ? \
-        sizeof(eth_header_lsap_t) : 0) - \
-        (IS_8023_2_SNAP(flags) ? sizeof(eth_header_snap_t) : 0))
+            ((IS_8023_2_LSAP(flags) || IS_8023_2_SNAP(flags)) ? \
+            sizeof(eth_header_lsap_t) : 0) - \
+            (IS_8023_2_SNAP(flags) ? sizeof(eth_header_snap_t) : 0))
 
 /** Dummy flag shift value. */
-#define ETH_DUMMY_SHIFT 0
+#define ETH_DUMMY_SHIFT  0
 
 /** Mode flag shift value. */
-#define ETH_MODE_SHIFT  1
+#define ETH_MODE_SHIFT  1
 
 /** Dummy device flag.
  * Preamble and FCS are mandatory part of the packets.
  */
-#define ETH_DUMMY               (1 << ETH_DUMMY_SHIFT)
+#define ETH_DUMMY  (1 << ETH_DUMMY_SHIFT)
 
 /** Returns the dummy flag.
  * @see ETH_DUMMY
  */
-#define IS_DUMMY(flags)         ((flags) & ETH_DUMMY)
+#define IS_DUMMY(flags)  ((flags) & ETH_DUMMY)
 
 /** Device mode flags.
@@ -119 +117 @@
  * @see ETH_8023_2_SNAP
  */
-#define ETH_MODE_MASK           (3 << ETH_MODE_SHIFT)
+#define ETH_MODE_MASK  (3 << ETH_MODE_SHIFT)
 
 /** DIX Ethernet mode flag. */
-#define ETH_DIX                 (1 << ETH_MODE_SHIFT)
-
-/** Returns whether the DIX Ethernet mode flag is set.
- *
- * @param[in] flags     The ethernet flags.
+#define ETH_DIX  (1 << ETH_MODE_SHIFT)
+
+/** Return whether the DIX Ethernet mode flag is set.
+ *
+ * @param[in] flags Ethernet flags.
  * @see ETH_DIX
- */
-#define IS_DIX(flags)           (((flags) & ETH_MODE_MASK) == ETH_DIX)
+ *
+ */
+#define IS_DIX(flags)  (((flags) & ETH_MODE_MASK) == ETH_DIX)
 
 /** 802.3 + 802.2 + LSAP mode flag. */
-#define ETH_8023_2_LSAP         (2 << ETH_MODE_SHIFT)
-
-/** Returns whether the 802.3 + 802.2 + LSAP mode flag is set.
- *
- * @param[in] flags     The ethernet flags.
+#define ETH_8023_2_LSAP  (2 << ETH_MODE_SHIFT)
+
+/** Return whether the 802.3 + 802.2 + LSAP mode flag is set.
+ *
+ * @param[in] flags Ethernet flags.
  * @see ETH_8023_2_LSAP
- */
-#define IS_8023_2_LSAP(flags)   (((flags) & ETH_MODE_MASK) == ETH_8023_2_LSAP)
+ *
+ */
+#define IS_8023_2_LSAP(flags)  (((flags) & ETH_MODE_MASK) == ETH_8023_2_LSAP)
 
 /** 802.3 + 802.2 + LSAP + SNAP mode flag. */
-#define ETH_8023_2_SNAP         (3 << ETH_MODE_SHIFT)
-
-/** Returns whether the 802.3 + 802.2 + LSAP + SNAP mode flag is set.
- *
- * @param[in] flags     The ethernet flags.
+#define ETH_8023_2_SNAP  (3 << ETH_MODE_SHIFT)
+
+/** Return whether the 802.3 + 802.2 + LSAP + SNAP mode flag is set.
+ *
+ * @param[in] flags Ethernet flags.
  * @see ETH_8023_2_SNAP
- */
-#define IS_8023_2_SNAP(flags)   (((flags) & ETH_MODE_MASK) == ETH_8023_2_SNAP)
+ *
+ */
+#define IS_8023_2_SNAP(flags)  (((flags) & ETH_MODE_MASK) == ETH_8023_2_SNAP)
 
 /** Type definition of the ethernet address type.
@@ -201 +202 @@
 
         eth_globals.broadcast_addr =
-            measured_string_create_bulk("\xFF\xFF\xFF\xFF\xFF\xFF", ETH_ADDR);
+            measured_string_create_bulk((uint8_t *) "\xFF\xFF\xFF\xFF\xFF\xFF", ETH_ADDR);
         if (!eth_globals.broadcast_addr) {
                 rc = ENOMEM;
@@ -239 +240 @@
                 switch (IPC_GET_IMETHOD(*icall)) {
                 case NET_NIL_DEVICE_STATE:
-                        nil_device_state_msg_local(0, IPC_GET_DEVICE(icall),
-                            IPC_GET_STATE(icall));
+                        nil_device_state_msg_local(0, IPC_GET_DEVICE(*icall),
+                            IPC_GET_STATE(*icall));
                         ipc_answer_0(iid, EOK);
                         break;
                 case NET_NIL_RECEIVED:
                         rc = packet_translate_remote(eth_globals.net_phone,
-                            &packet, IPC_GET_PACKET(icall));
-                        if (rc == EOK) {
+                            &packet, IPC_GET_PACKET(*icall));
+                        if (rc == EOK)
                                 rc = nil_received_msg_local(0,
-                                    IPC_GET_DEVICE(icall), packet, 0);
-                        }
+                                    IPC_GET_DEVICE(*icall), packet, 0);
+                        
                         ipc_answer_0(iid, (sysarg_t) rc);
                         break;
@@ -284 +285 @@
         measured_string_t names[2] = {
                 {
-                        (char *) "ETH_MODE",
+                        (uint8_t *) "ETH_MODE",
                         8
                 },
                 {
-                        (char *) "ETH_DUMMY",
+                        (uint8_t *) "ETH_DUMMY",
                         9
                 }
@@ -294 +295 @@
         measured_string_t *configuration;
         size_t count = sizeof(names) / sizeof(measured_string_t);
-        char *data;
+        uint8_t *data;
         eth_proto_t *proto;
         int rc;
@@ -358 +359 @@
 
         if (configuration) {
-                if (!str_lcmp(configuration[0].value, "DIX",
+                if (!str_lcmp((char *) configuration[0].value, "DIX",
                     configuration[0].length)) {
                         device->flags |= ETH_DIX;
-                } else if(!str_lcmp(configuration[0].value, "8023_2_LSAP",
+                } else if(!str_lcmp((char *) configuration[0].value, "8023_2_LSAP",
                     configuration[0].length)) {
                         device->flags |= ETH_8023_2_LSAP;
@@ -407 +408 @@
         
         printf("%s: Device registered (id: %d, service: %d: mtu: %zu, "
-            "mac: %x:%x:%x:%x:%x:%x, flags: 0x%x)\n",
+            "mac: %02x:%02x:%02x:%02x:%02x:%02x, flags: 0x%x)\n",
             NAME, device->device_id, device->service, device->mtu,
             device->addr_data[0], device->addr_data[1],
@@ -836 +837 @@
 }
 
-int nil_message_standalone(const char *name, ipc_callid_t callid,
-    ipc_call_t *call, ipc_call_t *answer, int *answer_count)
+int nil_module_message(ipc_callid_t callid, ipc_call_t *call,
+    ipc_call_t *answer, size_t *answer_count)
 {
         measured_string_t *address;
@@ -853 +854 @@
         
         case NET_NIL_DEVICE:
-                return eth_device_message(IPC_GET_DEVICE(call),
-                    IPC_GET_SERVICE(call), IPC_GET_MTU(call));
+                return eth_device_message(IPC_GET_DEVICE(*call),
+                    IPC_GET_SERVICE(*call), IPC_GET_MTU(*call));
         case NET_NIL_SEND:
                 rc = packet_translate_remote(eth_globals.net_phone, &packet,
-                    IPC_GET_PACKET(call));
+                    IPC_GET_PACKET(*call));
                 if (rc != EOK)
                         return rc;
-                return eth_send_message(IPC_GET_DEVICE(call), packet,
-                    IPC_GET_SERVICE(call));
+                return eth_send_message(IPC_GET_DEVICE(*call), packet,
+                    IPC_GET_SERVICE(*call));
         case NET_NIL_PACKET_SPACE:
-                rc = eth_packet_space_message(IPC_GET_DEVICE(call), &addrlen,
+                rc = eth_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);
+                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:
-                rc = eth_addr_message(IPC_GET_DEVICE(call), ETH_LOCAL_ADDR,
+                rc = eth_addr_message(IPC_GET_DEVICE(*call), ETH_LOCAL_ADDR,
                     &address);
                 if (rc != EOK)
@@ -880 +881 @@
                 return measured_strings_reply(address, 1);
         case NET_NIL_BROADCAST_ADDR:
-                rc = eth_addr_message(IPC_GET_DEVICE(call), ETH_BROADCAST_ADDR,
+                rc = eth_addr_message(IPC_GET_DEVICE(*call), ETH_BROADCAST_ADDR,
                     &address);
                 if (rc != EOK)
@@ -886 +887 @@
                 return measured_strings_reply(address, 1);
         case IPC_M_CONNECT_TO_ME:
-                return eth_register_message(NIL_GET_PROTO(call),
-                    IPC_GET_PHONE(call));
+                return eth_register_message(NIL_GET_PROTO(*call),
+                    IPC_GET_PHONE(*call));
         }
         
@@ -893 +894 @@
 }
 
-/** 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_IMETHOD(call) == IPC_M_PHONE_HUNGUP) ||
-                    (res == EHANGUP))
-                        return;
-                
-                /* Answer the message */
-                answer_call(callid, res, &answer, answer_count);
-        }
-}
-
 int main(int argc, char *argv[])
 {
-        int rc;
-        
         /* Start the module */
-        rc = nil_module_start_standalone(nil_client_connection);
-        return rc;
+        return nil_module_start(SERVICE_ETHERNET);
 }
 

uspace/srv/net/nil/eth/eth.h

@@ -44 +44 @@
 #include <adt/measured_strings.h>
 
+/** Ethernet address length. */
+#define ETH_ADDR  6
+
+/** Ethernet header preamble value. */
+#define ETH_PREAMBLE  0x55
+
+/** Ethernet header start of frame value. */
+#define ETH_SFD  0xD5
+
+/** IEEE 802.2 unordered information control field. */
+#define IEEE_8023_2_UI  0x03
+
+/** Type definition of the Ethernet header IEEE 802.3 + 802.2 + SNAP extensions.
+ * @see eth_header_snap
+ */
+typedef struct eth_header_snap eth_header_snap_t;
+
+/** Type definition of the Ethernet header IEEE 802.3 + 802.2 + SNAP extensions.
+ * @see eth_header_lsap
+ */
+typedef struct eth_header_lsap eth_header_lsap_t;
+
+/** Type definition of the Ethernet header LSAP extension.
+ * @see eth_ieee_lsap
+ */
+typedef struct eth_ieee_lsap eth_ieee_lsap_t;
+
+/** Type definition of the Ethernet header SNAP extension.
+ * @see eth_snap
+ */
+typedef struct eth_snap eth_snap_t;
+
+/** Type definition of the Ethernet header preamble.
+ * @see preamble
+ */
+typedef struct eth_preamble eth_preamble_t;
+
+/** Type definition of the Ethernet header.
+ * @see eth_header
+ */
+typedef struct eth_header eth_header_t;
+
+/** Ethernet header Link Service Access Point extension. */
+struct eth_ieee_lsap {
+        /**
+         * Destination Service Access Point identifier.
+         * The possible values are assigned by an IEEE committee.
+         */
+        uint8_t dsap;
+        
+        /**
+         * Source Service Access Point identifier.
+         * The possible values are assigned by an IEEE committee.
+         */
+        uint8_t ssap;
+        
+        /**
+         * Control parameter.
+         * The possible values are assigned by an IEEE committee.
+         */
+        uint8_t ctrl;
+} __attribute__ ((packed));
+
+/** Ethernet header SNAP extension. */
+struct eth_snap {
+        /** Protocol identifier or organization code. */
+        uint8_t protocol[3];
+        
+        /**
+         * Ethernet protocol identifier in the network byte order (big endian).
+         * @see ethernet_protocols.h
+         */
+        uint16_t ethertype;
+} __attribute__ ((packed));
+
+/** Ethernet header preamble.
+ *
+ * Used for dummy devices.
+ */
+struct eth_preamble {
+        /**
+         * Controlling preamble used for the frame transmission synchronization.
+         * All should be set to ETH_PREAMBLE.
+         */
+        uint8_t preamble[7];
+        
+        /**
+         * Start of Frame Delimiter used for the frame transmission
+         * synchronization.
+         * Should be set to ETH_SFD.
+         */
+        uint8_t sfd;
+} __attribute__ ((packed));
+
+/** Ethernet header. */
+struct eth_header {
+        /** Destination host Ethernet address (MAC address). */
+        uint8_t destination_address[ETH_ADDR];
+        /** Source host Ethernet address (MAC address). */
+        uint8_t source_address[ETH_ADDR];
+        
+        /**
+         * Ethernet protocol identifier in the network byte order (big endian).
+         * @see ethernet_protocols.h
+         */
+        uint16_t ethertype;
+} __attribute__ ((packed));
+
+/** Ethernet header IEEE 802.3 + 802.2 extension. */
+struct eth_header_lsap {
+        /** Ethernet header. */
+        eth_header_t header;
+        
+        /**
+         * LSAP extension.
+         * If DSAP and SSAP are set to ETH_LSAP_SNAP the SNAP extension is being
+         * used.
+         * If DSAP and SSAP fields are equal to ETH_RAW the raw Ethernet packet
+         * without any extensions is being used and the frame content starts
+         * rigth after the two fields.
+         */
+        eth_ieee_lsap_t lsap;
+} __attribute__ ((packed));
+
+/** Ethernet header IEEE 802.3 + 802.2 + SNAP extensions. */
+struct eth_header_snap {
+        /** Ethernet header. */
+        eth_header_t header;
+        
+        /**
+         * LSAP extension.
+         * If DSAP and SSAP are set to ETH_LSAP_SNAP the SNAP extension is being
+         * used.
+         * If DSAP and SSAP fields are equal to ETH_RAW the raw Ethernet packet
+         * without any extensions is being used and the frame content starts
+         * rigth after the two fields.
+         */
+        eth_ieee_lsap_t lsap;
+        
+        /** SNAP extension. */
+        eth_snap_t snap;
+} __attribute__ ((packed));
+
+/** Ethernet Frame Check Sequence. */
+typedef uint32_t eth_fcs_t;
+
 /** Type definition of the Ethernet global data.
  * @see eth_globals
@@ -91 +237 @@
         /** Actual device hardware address. */
         measured_string_t *addr;
+        
         /** Actual device hardware address data. */
-        char *addr_data;
+        uint8_t *addr_data;
 };
 

uspace/srv/net/nil/nildummy/Makefile

@@ -42 +42 @@
 
 SOURCES = \
-        nildummy.c \
-        nildummy_module.c
+        nildummy.c
 
 include $(USPACE_PREFIX)/Makefile.common

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

@@ -42 +42 @@
 #include <str.h>
 #include <ipc/ipc.h>
+#include <ipc/nil.h>
 #include <ipc/net.h>
 #include <ipc/services.h>
@@ -47 +48 @@
 #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"
@@ -81 +81 @@
 int nil_initialize(int net_phone)
 {
-        int rc;
-        
         fibril_rwlock_initialize(&nildummy_globals.devices_lock);
         fibril_rwlock_initialize(&nildummy_globals.protos_lock);
@@ -90 +88 @@
         nildummy_globals.net_phone = net_phone;
         nildummy_globals.proto.phone = 0;
-        rc = nildummy_devices_initialize(&nildummy_globals.devices);
+        int rc = nildummy_devices_initialize(&nildummy_globals.devices);
         
         fibril_rwlock_write_unlock(&nildummy_globals.protos_lock);
@@ -98 +96 @@
 }
 
-/** 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.
+/** 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)
@@ -108 +106 @@
         packet_t *packet;
         int rc;
-
+        
         while (true) {
                 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));
+                            IPC_GET_DEVICE(*icall), IPC_GET_STATE(*icall));
                         ipc_answer_0(iid, (sysarg_t) rc);
                         break;
@@ -119 +117 @@
                 case NET_NIL_RECEIVED:
                         rc = packet_translate_remote(nildummy_globals.net_phone,
-                            &packet, IPC_GET_PACKET(icall));
-                        if (rc == EOK) {
+                            &packet, IPC_GET_PACKET(*icall));
+                        if (rc == EOK)
                                 rc = nil_received_msg_local(0,
-                                    IPC_GET_DEVICE(icall), packet, 0);
-                        }
+                                    IPC_GET_DEVICE(*icall), packet, 0);
+                        
                         ipc_answer_0(iid, (sysarg_t) rc);
                         break;
@@ -139 +137 @@
  * 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.
- * @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.
+ * @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)
 {
-        nildummy_device_t *device;
-        int index;
-        int rc;
-
         fibril_rwlock_write_lock(&nildummy_globals.devices_lock);
-
+        
         /* An existing device? */
-        device = nildummy_devices_find(&nildummy_globals.devices, device_id);
+        nildummy_device_t *device =
+            nildummy_devices_find(&nildummy_globals.devices, device_id);
         if (device) {
                 if (device->service != service) {
@@ -213 +210 @@
         
         /* Get hardware address */
-        rc = netif_get_addr_req(device->phone, device->device_id, &device->addr,
-            &device->addr_data);
+        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);
@@ -222 +219 @@
         
         /* Add to the cache */
-        index = nildummy_devices_add(&nildummy_globals.devices,
+        int index = nildummy_devices_add(&nildummy_globals.devices,
             device->device_id, device);
         if (index < 0) {
@@ -240 +237 @@
 /** 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.
+ * @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.
  *
  */
@@ -250 +248 @@
     measured_string_t **address)
 {
-        nildummy_device_t *device;
-
         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);
         
@@ -269 +269 @@
 /** 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.
+ * @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.
  *
  */
@@ -282 +283 @@
     size_t *prefix, size_t *content, size_t *suffix)
 {
-        nildummy_device_t *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);
         
@@ -306 +308 @@
     packet_t *packet, services_t target)
 {
-        packet_t *next;
-
         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);
         
@@ -326 +328 @@
  * 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)
@@ -347 +351 @@
 /** 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.
+ * @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)
 {
-        nildummy_device_t *device;
-
         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 */
         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)
+        
+        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;
@@ -391 +399 @@
         
         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:
                 rc = packet_translate_remote(nildummy_globals.net_phone,
-                    &packet, IPC_GET_PACKET(call));
+                    &packet, IPC_GET_PACKET(*call));
                 if (rc != EOK)
                         return rc;
-                return nildummy_send_message(IPC_GET_DEVICE(call), packet,
-                    IPC_GET_SERVICE(call));
+                return nildummy_send_message(IPC_GET_DEVICE(*call), packet,
+                    IPC_GET_SERVICE(*call));
         
         case NET_NIL_PACKET_SPACE:
-                rc = nildummy_packet_space_message(IPC_GET_DEVICE(call),
+                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);
+                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:
-                rc = nildummy_addr_message(IPC_GET_DEVICE(call), &address);
+                rc = nildummy_addr_message(IPC_GET_DEVICE(*call), &address);
                 if (rc != EOK)
                         return rc;
@@ -421 +429 @@
         
         case NET_NIL_BROADCAST_ADDR:
-                rc = nildummy_addr_message(IPC_GET_DEVICE(call), &address);
+                rc = nildummy_addr_message(IPC_GET_DEVICE(*call), &address);
                 if (rc != EOK)
                         return rc;
@@ -427 +435 @@
         
         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));
         }
         
@@ -434 +442 @@
 }
 
-/** 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_IMETHOD(call) == IPC_M_PHONE_HUNGUP) ||
-                    (res == EHANGUP))
-                        return;
-                
-                /* Answer the message */
-                answer_call(callid, res, &answer, answer_count);
-        }
-}
-
 int main(int argc, char *argv[])
 {
-        int rc;
-        
         /* Start the module */
-        rc = nil_module_start_standalone(nil_client_connection);
-        return rc;
+        return nil_module_start(SERVICE_NILDUMMY);
 }
 

uspace/srv/net/nil/nildummy/nildummy.h

@@ -45 +45 @@
 
 /** Type definition of the dummy nil global data.
+ *
  * @see nildummy_globals
+ *
  */
 typedef struct nildummy_globals nildummy_globals_t;
 
 /** Type definition of the dummy nil device specific data.
+ *
  * @see nildummy_device
+ *
  */
 typedef struct nildummy_device nildummy_device_t;
 
 /** Type definition of the dummy nil protocol specific data.
+ *
  * @see nildummy_proto
+ *
  */
 typedef struct nildummy_proto nildummy_proto_t;
 
 /** Dummy nil device map.
- * Maps devices to the dummy nil device specific data.
+ *
+ * Map devices to the dummy nil device specific data.
  * @see device.h
+ *
  */
 DEVICE_MAP_DECLARE(nildummy_devices, nildummy_device_t);
@@ -69 +77 @@
         /** Device identifier. */
         device_id_t device_id;
+        
         /** Device driver service. */
         services_t service;
+        
         /** Driver phone. */
         int phone;
+        
         /** Maximal transmission unit. */
         size_t mtu;
+        
         /** Actual device hardware address. */
         measured_string_t *addr;
+        
         /** Actual device hardware address data. */
-        char *addr_data;
+        uint8_t *addr_data;
 };
 
@@ -85 +98 @@
         /** Protocol service. */
         services_t service;
+        
         /** Protocol module phone. */
         int phone;
@@ -93 +107 @@
         /** Networking module phone. */
         int net_phone;
-        /** Safety lock for devices. */
+        
+        /** Lock for devices. */
         fibril_rwlock_t devices_lock;
+        
         /** All known Ethernet devices. */
         nildummy_devices_t devices;
+        
         /** Safety lock for protocols. */
         fibril_rwlock_t protos_lock;
+        
         /** Default protocol. */
         nildummy_proto_t proto;