Changes in uspace/srv/net/il/arp/arp_module.c [fb04cba8:14f1db0] in mainline

File:

• uspace/srv/net/il/arp/arp_module.c (modified) (2 diffs)

uspace/srv/net/il/arp/arp_module.c

@@ -32 +32 @@
 
 /** @file
- * ARP standalone module implementation.
- * Contains skeleton module functions mapping.
- * The functions are used by the module skeleton as module specific entry
- * points.
- * @see module.c
+ *  ARP standalone module implementation.
+ *  Contains skeleton module functions mapping.
+ *  The functions are used by the module skeleton as module specific entry points.
+ *  @see module.c
  */
 
 #include <async.h>
 #include <stdio.h>
-#include <errno.h>
 
 #include <ipc/ipc.h>
 #include <ipc/services.h>
 
-#include <net/modules.h>
+#include <net_err.h>
+#include <net_modules.h>
 #include <net_interface.h>
-#include <net/packet.h>
+#include <packet/packet.h>
 #include <il_local.h>
 
@@ -54 +53 @@
 #include "arp_module.h"
 
-/** ARP module global data. */
-extern arp_globals_t arp_globals;
+/** ARP module global data.
+ */
+extern arp_globals_t    arp_globals;
 
-int il_module_message_standalone(ipc_callid_t callid, ipc_call_t *call,
-    ipc_call_t *answer, int *answer_count)
-{
+/** Processes the ARP message.
+ *  @param[in] callid The message identifier.
+ *  @param[in] call The message parameters.
+ *  @param[out] answer The message answer parameters.
+ *  @param[out] answer_count The last parameter for the actual answer in the answer parameter.
+ *  @returns EOK on success.
+ *  @returns Other error codes as defined for the arp_message() function.
+ */
+int il_module_message_standalone(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
         return arp_message_standalone(callid, call, answer, answer_count);
 }
 
-int il_module_start_standalone(async_client_conn_t client_connection)
-{
-        ipcarg_t phonehash;
-        int rc;
+/** Starts the ARP module.
+ *  Initializes the client connection serving function, initializes the module, registers the module service and starts the async manager, processing IPC messages in an infinite loop.
+ *  @param[in] client_connection The client connection processing function. The module skeleton propagates its own one.
+ *  @returns EOK on successful module termination.
+ *  @returns Other error codes as defined for the arp_initialize() function.
+ *  @returns Other error codes as defined for the REGISTER_ME() macro function.
+ */
+int il_module_start_standalone(async_client_conn_t client_connection){
+        ERROR_DECLARE;
         
         async_set_client_connection(client_connection);
-        arp_globals.net_phone = net_connect_module();
+        arp_globals.net_phone = net_connect_module(SERVICE_NETWORKING);
+        ERROR_PROPAGATE(pm_init());
         
-        rc = pm_init();
-        if (rc != EOK)
-                return rc;
-        
-        rc = arp_initialize(client_connection);
-        if (rc != EOK)
-                goto out;
-        
-        rc = REGISTER_ME(SERVICE_ARP, &phonehash);
-        if (rc != EOK)
-                goto out;
+        ipcarg_t phonehash;
+        if (ERROR_OCCURRED(arp_initialize(client_connection))
+            || ERROR_OCCURRED(REGISTER_ME(SERVICE_ARP, &phonehash))) {
+                pm_destroy();
+                return ERROR_CODE;
+        }
         
         async_manager();
-
-out:
+        
         pm_destroy();
-        return rc;
+        return EOK;
 }