Changeset 330df83 in mainline for uspace/app/ping6/ping6.c

Timestamp:

2013-07-19T20:42:57Z (11 years ago)

Author:

Manuele Conti <conti.ma@…>

Branches:

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

Children:

f4cbf9dd

Parents:

8a8a08d1 (diff), cd18cd1 (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 with mainline changes.

File:

• uspace/app/ping6/ping6.c (modified) (2 diffs)

uspace/app/ping6/ping6.c

@@ -102 +102 @@
         }
         
-        printf("Received ICMP echo reply: from %s to %s, seq. no %u, "
+        printf("Received ICMPv6 echo reply: from %s to %s, seq. no %u, "
             "payload size %zu\n", asrc, adest, sdu->seq_no, sdu->size);
         
@@ -212 +212 @@
         if (rc != EOK) {
                 /* Try interpreting as a host name */
-                rc = dnsr_name2host(argv[argi], &hinfo);
+                rc = dnsr_name2host(argv[argi], &hinfo, AF_INET6);
                 if (rc != EOK) {
                         printf(NAME ": Error resolving host '%s'.\n", argv[argi]);