Changeset 02a09ed in mainline for uspace/app/ping/ping.c

Timestamp:

2013-06-28T20:20:03Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

1d24ad3

Parents:

edf0d27

Message:

add basic infrastructure for IPv6 (inactive)
make inet_addr_t a universal address type

File:

• uspace/app/ping/ping.c (modified) (5 diffs)

uspace/app/ping/ping.c

@@ -37 +37 @@
 #include <errno.h>
 #include <fibril_synch.h>
+#include <net/socket_codes.h>
 #include <inet/dnsr.h>
 #include <inet/addr.h>
@@ -63 +64 @@
 };
 
-static uint32_t src;
-static uint32_t dest;
+static addr32_t src;
+static addr32_t dest;
 
 static bool ping_repeat = false;
@@ -84 +85 @@
 {
         inet_addr_t src_addr;
-        inet_addr_unpack(sdu->src, &src_addr);
+        inet_addr_set(sdu->src, &src_addr);
         
         inet_addr_t dest_addr;
-        inet_addr_unpack(sdu->dest, &dest_addr);
+        inet_addr_set(sdu->dest, &dest_addr);
         
         char *asrc;
@@ -220 +221 @@
         }
         
-        rc = inet_addr_pack(&dest_addr, &dest);
-        if (rc != EOK) {
+        uint16_t af = inet_addr_get(&dest_addr, &dest, NULL);
+        if (af != AF_INET) {
                 printf(NAME ": Destination '%s' is not an IPv4 address.\n",
                     argv[argi]);
@@ -235 +236 @@
         
         inet_addr_t src_addr;
-        inet_addr_unpack(src, &src_addr);
+        inet_addr_set(src, &src_addr);
         
         rc = inet_addr_format(&src_addr, &asrc);