Changeset 10056483 in mainline for uspace/lib/c/generic/net/icmp_common.c

Timestamp:

2010-10-13T22:48:25Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ef689ef0

Parents:

b278b4e (diff), 753bca3 (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 from lp:~jakub/helenos/net.

File:

• uspace/lib/c/generic/net/icmp_common.c (moved) (moved from uspace/lib/socket/generic/icmp_common.c ) (1 diff)

uspace/lib/c/generic/net/icmp_common.c

@@ -27 +27 @@
  */
 
-/** @addtogroup icmp
+/** @addtogroup libc 
  *  @{
  */
 
 /** @file
- *  ICMP common interface implementation.
- *  @see icmp_common.h
+ * ICMP common interface implementation.
+ * @see icmp_common.h
  */
 
+#include <net/modules.h>
+#include <net/icmp_common.h>
+
+#include <ipc/services.h>
+#include <ipc/icmp.h>
+
+#include <sys/time.h>
 #include <async.h>
-#include <ipc/services.h>
 
-#include <net/modules.h>
-#include <icmp_common.h>
-#include <icmp_messages.h>
-
-int icmp_connect_module(services_t service, suseconds_t timeout){
+/** Connects to the ICMP module.
+ *
+ * @param service       The ICMP module service. Ignored parameter.
+ * @param[in] timeout   The connection timeout in microseconds. No timeout if
+ *                      set to zero.
+ * @returns             The ICMP module phone on success.
+ * @returns             ETIMEOUT if the connection timeouted.
+ */
+int icmp_connect_module(services_t service, suseconds_t timeout)
+{
         int phone;
 
         phone = connect_to_service_timeout(SERVICE_ICMP, timeout);
-        if(phone >= 0){
+        if (phone >= 0)
                 async_req_0_0(phone, NET_ICMP_INIT);
-        }
+
         return phone;
 }