Changeset a2e3ee6 in mainline for uspace/app/ping/ping.c

Timestamp:

2013-06-20T16:45:58Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

08bb73b

Parents:

19a4f73

Message:

use new network address infrastructure (towards IPv6 support)

File:

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

uspace/app/ping/ping.c

@@ -83 +83 @@
 static int ping_ev_recv(inetping_sdu_t *sdu)
 {
-        inet2_addr_t src_addr;
-        inet2_addr_unpack(sdu->src, &src_addr);
-        
-        inet2_addr_t dest_addr;
-        inet2_addr_unpack(sdu->dest, &dest_addr);
+        inet_addr_t src_addr;
+        inet_addr_unpack(sdu->src, &src_addr);
+        
+        inet_addr_t dest_addr;
+        inet_addr_unpack(sdu->dest, &dest_addr);
         
         char *asrc;
-        int rc = inet2_addr_format(&src_addr, &asrc);
+        int rc = inet_addr_format(&src_addr, &asrc);
         if (rc != EOK)
                 return ENOMEM;
         
         char *adest;
-        rc = inet2_addr_format(&dest_addr, &adest);
+        rc = inet_addr_format(&dest_addr, &adest);
         if (rc != EOK) {
                 free(asrc);
@@ -207 +207 @@
 
         /* Parse destination address */
-        inet2_addr_t dest_addr;
-        rc = inet2_addr_parse(argv[argi], &dest_addr);
+        inet_addr_t dest_addr;
+        rc = inet_addr_parse(argv[argi], &dest_addr);
         if (rc != EOK) {
                 /* Try interpreting as a host name */
@@ -220 +220 @@
         }
         
-        rc = inet2_addr_pack(&dest_addr, &dest);
+        rc = inet_addr_pack(&dest_addr, &dest);
         if (rc != EOK) {
                 printf(NAME ": Destination '%s' is not an IPv4 address.\n",
@@ -234 +234 @@
         }
         
-        inet2_addr_t src_addr;
-        inet2_addr_unpack(src, &src_addr);
-        
-        rc = inet2_addr_format(&src_addr, &asrc);
+        inet_addr_t src_addr;
+        inet_addr_unpack(src, &src_addr);
+        
+        rc = inet_addr_format(&src_addr, &asrc);
         if (rc != EOK) {
                 printf(NAME ": Out of memory.\n");
@@ -243 +243 @@
         }
         
-        rc = inet2_addr_format(&dest_addr, &adest);
+        rc = inet_addr_format(&dest_addr, &adest);
         if (rc != EOK) {
                 printf(NAME ": Out of memory.\n");