Changeset 26e7d6d in mainline for uspace/lib/c/generic/net/icmp_api.c

Timestamp:

2011-09-19T16:31:00Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a347a11

Parents:

3842a955 (diff), 086290d (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/lib/c/generic/net/icmp_api.c (modified) (4 diffs)

uspace/lib/c/generic/net/icmp_api.c

@@ -42 +42 @@
 #include <net/ip_codes.h>
 #include <async.h>
-#include <async_obsolete.h>
 #include <sys/types.h>
 #include <sys/time.h>
@@ -55 +54 @@
  * timeout occurs.
  *
- * @param[in] icmp_phone The ICMP module phone used for (semi)remote calls.
+ * @param[in] sess The ICMP session.
  * @param[in] size      The message data length in bytes.
  * @param[in] timeout   The timeout in milliseconds.
@@ -74 +73 @@
  */
 int
-icmp_echo_msg(int icmp_phone, size_t size, mseconds_t timeout, ip_ttl_t ttl,
+icmp_echo_msg(async_sess_t *sess, size_t size, mseconds_t timeout, ip_ttl_t ttl,
     ip_tos_t tos, int dont_fragment, const struct sockaddr *addr,
     socklen_t addrlen)
@@ -83 +82 @@
         if (addrlen <= 0)
                 return EINVAL;
-
-        message_id = async_obsolete_send_5(icmp_phone, NET_ICMP_ECHO, size, timeout, ttl,
+        
+        async_exch_t *exch = async_exchange_begin(sess);
+        
+        message_id = async_send_5(exch, NET_ICMP_ECHO, size, timeout, ttl,
             tos, (sysarg_t) dont_fragment, NULL);
-
+        
         /* Send the address */
-        async_obsolete_data_write_start(icmp_phone, addr, (size_t) addrlen);
+        async_data_write_start(exch, addr, (size_t) addrlen);
+        
+        async_exchange_end(exch);
 
         async_wait_for(message_id, &result);