Changeset f1938c6 in mainline for uspace/lib/c

Timestamp:

2011-01-17T15:41:30Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

a2d8d59, ffaba00

Parents:

9f3864a

Message:

streamline ICMP implementation

• generate ICMP identification based on fibril counter
• use fibril-local ICMP sequence numbers
• use hash table (instead of char map) for ICMP replies
• simplify locking
• simplify ICMP communication

Location:

uspace/lib/c

Files:

• generic/net/icmp_common.c (modified) (2 diffs)
• include/ipc/icmp.h (modified) (5 diffs)
• include/net/icmp_common.h (modified) (1 diff)

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

@@ -27 +27 @@
  */
 
-/** @addtogroup libc 
+/** @addtogroup libc
  *  @{
  */
@@ -38 +38 @@
 #include <net/modules.h>
 #include <net/icmp_common.h>
-
 #include <ipc/services.h>
 #include <ipc/icmp.h>
-
 #include <sys/time.h>
 #include <async.h>
 
-/** Connects to the ICMP module.
+/** Connect 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.
- * @return              The ICMP module phone on success.
- * @return              ETIMEOUT if the connection timeouted.
+ * @param[in] timeout Connection timeout in microseconds, zero
+ *                    for no timeout.
+ *
+ * @return ICMP module phone on success.
+ * @return ETIMEOUT if the connection timeouted.
+ *
  */
-int icmp_connect_module(services_t service, suseconds_t timeout)
+int icmp_connect_module(suseconds_t timeout)
 {
-        int phone;
-
-        phone = connect_to_service_timeout(SERVICE_ICMP, timeout);
-        if (phone >= 0)
-                async_req_0_0(phone, NET_ICMP_INIT);
-
-        return phone;
+        return connect_to_service_timeout(SERVICE_ICMP, timeout);
 }
 

uspace/lib/c/include/ipc/icmp.h

@@ -33 +33 @@
 /** @file
  * ICMP module messages.
- * @see icmp_interface.h
+ * @see icmp_remote.h
  */
 
@@ -48 +48 @@
 /** ICMP module messages. */
 typedef enum {
-        /** Sends echo request. @see icmp_echo() */
+        /** Send echo request. @see icmp_echo() */
         NET_ICMP_ECHO = NET_ICMP_FIRST,
         
         /**
-         * Sends destination unreachable error message.
+         * Send destination unreachable error message.
          * @see icmp_destination_unreachable_msg()
          */
@@ -58 +58 @@
         
         /**
-         * Sends source quench error message.
+         * Send source quench error message.
          * @see icmp_source_quench_msg()
          */
@@ -64 +64 @@
         
         /**
-         * Sends time exceeded error message.
+         * Send time exceeded error message.
          * @see icmp_time_exceeded_msg()
          */
@@ -70 +70 @@
         
         /**
-         * Sends parameter problem error message.
+         * Send parameter problem error message.
          * @see icmp_parameter_problem_msg()
          */
-        NET_ICMP_PARAMETERPROB,
-        
-        /** Initializes new connection. */
-        NET_ICMP_INIT
-} icmp_messages;
+        NET_ICMP_PARAMETERPROB
+} icmp_messages_t;
 
 /** @name ICMP specific message parameters definitions */

uspace/lib/c/include/net/icmp_common.h

@@ -41 +41 @@
 #include <sys/time.h>
 
-/** Default timeout for incoming connections in microseconds. */
-#define ICMP_CONNECT_TIMEOUT    (1 * 1000 * 1000)
+/** Default timeout for incoming connections in microseconds (1 sec). */
+#define ICMP_CONNECT_TIMEOUT  1000000
 
-extern int icmp_connect_module(services_t, suseconds_t);
+extern int icmp_connect_module(suseconds_t);
 
 #endif