Changeset b40bfac in mainline for uspace/srv/net/tl/icmp/icmp_module.c

Timestamp:

2010-11-08T07:13:25Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

63a1e60

Parents:

d70a463 (diff), 3da12d74 (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/tl/icmp/icmp_module.c (modified) (2 diffs)

uspace/srv/net/tl/icmp/icmp_module.c

@@ -28 +28 @@
 
 /** @addtogroup icmp
- *  @{
+ * @{
  */
 
 /** @file
- *  ICMP standalone module implementation.
- *  Contains skeleton module functions mapping.
- *  The functions are used by the module skeleton as module specific entry points.
- *  @see module.c
+ * ICMP 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 "icmp.h"
+#include "icmp_module.h"
 
 #include <async.h>
 #include <stdio.h>
-#include <err.h>
+#include <errno.h>
 #include <ipc/ipc.h>
 #include <ipc/services.h>
@@ -47 +50 @@
 #include <net/packet.h>
 #include <net_interface.h>
+
 #include <tl_local.h>
 
-#include "icmp.h"
-#include "icmp_module.h"
+/** ICMP module global data. */
+extern icmp_globals_t icmp_globals;
 
-/** ICMP module global data.
- */
-extern icmp_globals_t   icmp_globals;
-
-/** Starts the ICMP 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 tl_module_start_standalone(async_client_conn_t client_connection){
-        ERROR_DECLARE;
-
+int tl_module_start_standalone(async_client_conn_t client_connection)
+{
         ipcarg_t phonehash;
+        int rc;
 
         async_set_client_connection(client_connection);
         icmp_globals.net_phone = net_connect_module();
-        if(icmp_globals.net_phone < 0){
+        if (icmp_globals.net_phone < 0)
                 return icmp_globals.net_phone;
-        }
-        ERROR_PROPAGATE(pm_init());
-        if(ERROR_OCCURRED(icmp_initialize(client_connection))
-                || ERROR_OCCURRED(REGISTER_ME(SERVICE_ICMP, &phonehash))){
-                pm_destroy();
-                return ERROR_CODE;
-        }
+
+        rc = pm_init();
+        if (rc != EOK)
+                return rc;
+        
+        rc = icmp_initialize(client_connection);
+        if (rc != EOK)
+                goto out;
+
+        rc = REGISTER_ME(SERVICE_ICMP, &phonehash);
+        if (rc != EOK)
+                goto out;
 
         async_manager();
 
+out:
         pm_destroy();
-        return EOK;
+        return rc;
 }
 
-/** Processes the ICMP 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 icmp_message() function.
- */
-int tl_module_message_standalone(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
+int
+tl_module_message_standalone(ipc_callid_t callid, ipc_call_t *call,
+    ipc_call_t *answer, int *answer_count)
+{
         return icmp_message_standalone(callid, call, answer, answer_count);
 }