Changeset 89c57b6 in mainline for uspace/app/ping/ping.c

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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/app/ping/ping.c (modified) (6 diffs)

uspace/app/ping/ping.c

@@ -35 +35 @@
  */
 
+#include <async.h>
 #include <stdio.h>
 #include <str.h>
 #include <task.h>
 #include <time.h>
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <str_error.h>
+#include <errno.h>
 #include <arg_parse.h>
 
-#include <icmp_api.h>
-#include <in.h>
-#include <in6.h>
-#include <inet.h>
-#include <ip_codes.h>
-#include <socket_errno.h>
-#include <socket_parse.h>
+#include <net/icmp_api.h>
+#include <net/in.h>
+#include <net/in6.h>
+#include <net/inet.h>
+#include <net/socket_parse.h>
+#include <net/ip_codes.h>
 
 #include "print_error.h"
@@ -337 +337 @@
         }
         
-        printf("PING %s (%s) %u(%u) bytes of data\n", config.dest_addr,
+        printf("PING %s (%s) %zu(%zu) bytes of data\n", config.dest_addr,
             config.dest_str, config.size, config.size);
         
-        int icmp_phone = icmp_connect_module(SERVICE_ICMP, ICMP_CONNECT_TIMEOUT);
+        int icmp_phone = icmp_connect_module(ICMP_CONNECT_TIMEOUT);
         if (icmp_phone < 0) {
                 fprintf(stderr, "%s: Unable to connect to ICMP service (%s)\n", NAME,
@@ -355 +355 @@
                             str_error(ret));
                         
-                        ipc_hangup(icmp_phone);
+                        async_hangup(icmp_phone);
                         return ret;
                 }
@@ -370 +370 @@
                             str_error(ret));
                         
-                        ipc_hangup(icmp_phone);
+                        async_hangup(icmp_phone);
                         return ret;
                 }
@@ -378 +378 @@
                 switch (result) {
                 case ICMP_ECHO:
-                        printf("%u bytes from ? (?): icmp_seq=%u ttl=? time=%u.%04u\n",
+                        printf("%zu bytes from ? (?): icmp_seq=%u ttl=? time=%ld.%04ld\n",
                                 config.size, seq, elapsed / 1000, elapsed % 1000);
                         break;
                 case ETIMEOUT:
-                        printf("%u bytes from ? (?): icmp_seq=%u Timed out\n",
+                        printf("%zu bytes from ? (?): icmp_seq=%u Timed out\n",
                                 config.size, seq);
                         break;
@@ -390 +390 @@
         }
         
-        ipc_hangup(icmp_phone);
+        async_hangup(icmp_phone);
         
         return 0;