Changes in uspace/lib/c/include/ipc/icmp.h [64d2b10:753bca3] in mainline

File:

• uspace/lib/c/include/ipc/icmp.h (modified) (5 diffs)

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

@@ -33 +33 @@
 /** @file
  * ICMP module messages.
- * @see icmp_remote.h
+ * @see icmp_interface.h
  */
 
@@ -39 +39 @@
 #define LIBC_ICMP_MESSAGES_
 
+#include <ipc/ipc.h>
 #include <ipc/net.h>
 #include <sys/types.h>
 #include <sys/time.h>
+
 #include <net/icmp_codes.h>
 
 /** ICMP module messages. */
 typedef enum {
-        /** Send echo request. @see icmp_echo() */
+        /** Sends echo request. @see icmp_echo() */
         NET_ICMP_ECHO = NET_ICMP_FIRST,
         
         /**
-         * Send destination unreachable error message.
+         * Sends destination unreachable error message.
          * @see icmp_destination_unreachable_msg()
          */
@@ -56 +58 @@
         
         /**
-         * Send source quench error message.
+         * Sends source quench error message.
          * @see icmp_source_quench_msg()
          */
@@ -62 +64 @@
         
         /**
-         * Send time exceeded error message.
+         * Sends time exceeded error message.
          * @see icmp_time_exceeded_msg()
          */
@@ -68 +70 @@
         
         /**
-         * Send parameter problem error message.
+         * Sends parameter problem error message.
          * @see icmp_parameter_problem_msg()
          */
-        NET_ICMP_PARAMETERPROB
-} icmp_messages_t;
+        NET_ICMP_PARAMETERPROB,
+        
+        /** Initializes new connection. */
+        NET_ICMP_INIT
+} icmp_messages;
 
 /** @name ICMP specific message parameters definitions */
 /*@{*/
 
-/** Return the ICMP code message parameter.
+/** Returns the ICMP code message parameter.
  *
- * @param[in] call Message call structure.
+ * @param[in] call      The message call structure.
+ */
+#define ICMP_GET_CODE(call) \
+        ({ \
+                icmp_code_t code = (icmp_code_t) IPC_GET_ARG1(*call); \
+                code; \
+        })
+
+/** Returns the ICMP link MTU message parameter.
  *
+ * @param[in] call      The message call structure.
  */
-#define ICMP_GET_CODE(call)  ((icmp_code_t) IPC_GET_ARG1(call))
+#define ICMP_GET_MTU(call) \
+        ({ \
+                icmp_param_t mtu = (icmp_param_t) IPC_GET_ARG3(*call); \
+                mtu; \
+        })
 
-/** Return the ICMP link MTU message parameter.
+/** Returns the pointer message parameter.
  *
- * @param[in] call Message call structure.
+ * @param[in] call      The message call structure.
+ */
+#define ICMP_GET_POINTER(call) \
+        ({ \
+                icmp_param_t pointer = (icmp_param_t) IPC_GET_ARG3(*call); \
+                pointer; \
+        })
+
+/** Returns the size message parameter.
  *
+ * @param[in] call      The message call structure.
  */
-#define ICMP_GET_MTU(call)  ((icmp_param_t) IPC_GET_ARG3(call))
+#define ICMP_GET_SIZE(call) \
+        ({ \
+                size_t size = (size_t) IPC_GET_ARG1(call); \
+                size; \
+        })
 
-/** Return the pointer message parameter.
+/** Returns the timeout message parameter.
  *
- * @param[in] call Message call structure.
+ * @param[in] call      The message call structure.
+ */
+#define ICMP_GET_TIMEOUT(call) \
+        ({ \
+                suseconds_t timeout = (suseconds_t) IPC_GET_ARG2(call); \
+                timeout; \
+        })
+
+/** Returns the time to live message parameter.
  *
+ * @param[in] call      The message call structure.
  */
-#define ICMP_GET_POINTER(call)  ((icmp_param_t) IPC_GET_ARG3(call))
+#define ICMP_GET_TTL(call) \
+        ({ \
+                ip_ttl_t ttl = (ip_ttl_t) IPC_GET_ARG3(call); \
+                ttl; \
+        })
 
-/** Return the size message parameter.
+/** Returns the type of service message parameter.
  *
- * @param[in] call Message call structure.
+ * @param[in] call      The message call structure.
+ */
+#define ICMP_GET_TOS(call) \
+        ({ \
+                ip_tos_t tos = (ip_tos_t) IPC_GET_ARG4(call); \
+                tos; \
+        })
+
+/** Returns the dont fragment message parameter.
  *
+ * @param[in] call      The message call structure.
  */
-#define ICMP_GET_SIZE(call)  ((size_t) IPC_GET_ARG1(call))
-
-/** Return the timeout message parameter.
- *
- * @param[in] call Message call structure.
- *
- */
-#define ICMP_GET_TIMEOUT(call)  ((suseconds_t) IPC_GET_ARG2(call))
-
-/** Return the time to live message parameter.
- *
- * @param[in] call Message call structure.
- *
- */
-#define ICMP_GET_TTL(call)  ((ip_ttl_t) IPC_GET_ARG3(call))
-
-/** Return the type of service message parameter.
- *
- * @param[in] call Message call structure.
- *
- */
-#define ICMP_GET_TOS(call)  ((ip_tos_t) IPC_GET_ARG4(call))
-
-/** Return the dont fragment message parameter.
- *
- * @param[in] call Message call structure.
- */
-#define ICMP_GET_DONT_FRAGMENT(call)  ((int) IPC_GET_ARG5(call))
+#define ICMP_GET_DONT_FRAGMENT(call) \
+        ({ \
+                int dont_fragment = (int) IPC_GET_ARG5(call); \
+                dont_fragment; \
+        })
 
 /*@}*/