Changeset 98abd40 in mainline for uspace/app/ping/ping.c

Timestamp:

2013-07-06T21:57:22Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c8bb1633, cdc8a391

Parents:

b8e72fd1 (diff), 507c6f3 (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) (9 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 inet_addr_t src_addr;
-static inet_addr_t dest_addr;
+static addr32_t src;
+static addr32_t dest;
 
 static bool ping_repeat = false;
@@ -83 +84 @@
 static int ping_ev_recv(inetping_sdu_t *sdu)
 {
-        char *asrc, *adest;
-        int rc;
-
-        rc = inet_addr_format(&sdu->src, &asrc);
+        inet_addr_t src_addr;
+        inet_addr_set(sdu->src, &src_addr);
+        
+        inet_addr_t dest_addr;
+        inet_addr_set(sdu->dest, &dest_addr);
+        
+        char *asrc;
+        int rc = inet_addr_format(&src_addr, &asrc);
         if (rc != EOK)
                 return ENOMEM;
-
-        rc = inet_addr_format(&sdu->dest, &adest);
+        
+        char *adest;
+        rc = inet_addr_format(&dest_addr, &adest);
         if (rc != EOK) {
                 free(asrc);
                 return ENOMEM;
         }
+        
         printf("Received ICMP echo reply: from %s to %s, seq. no %u, "
             "payload size %zu\n", asrc, adest, sdu->seq_no, sdu->size);
-
-        if (!ping_repeat) {
+        
+        if (!ping_repeat)
                 ping_signal_done();
-        }
-
+        
         free(asrc);
         free(adest);
@@ -112 +118 @@
         int rc;
 
-        sdu.src = src_addr;
-        sdu.dest = dest_addr;
+        sdu.src = src;
+        sdu.dest = dest;
         sdu.seq_no = seq_no;
         sdu.data = (void *) "foo";
@@ -202 +208 @@
 
         /* Parse destination address */
+        inet_addr_t dest_addr;
         rc = inet_addr_parse(argv[argi], &dest_addr);
         if (rc != EOK) {
@@ -210 +217 @@
                         goto error;
                 }
-
+                
                 dest_addr = hinfo->addr;
         }
-
+        
+        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]);
+                goto error;
+        }
+        
         /* Determine source address */
-        rc = inetping_get_srcaddr(&dest_addr, &src_addr);
+        rc = inetping_get_srcaddr(dest, &src);
         if (rc != EOK) {
                 printf(NAME ": Failed determining source address.\n");
                 goto error;
         }
-
+        
+        inet_addr_t src_addr;
+        inet_addr_set(src, &src_addr);
+        
         rc = inet_addr_format(&src_addr, &asrc);
         if (rc != EOK) {
@@ -226 +243 @@
                 goto error;
         }
-
+        
         rc = inet_addr_format(&dest_addr, &adest);
         if (rc != EOK) {
@@ -232 +249 @@
                 goto error;
         }
-
+        
         if (hinfo != NULL) {
                 rc = asprintf(&sdest, "%s (%s)", hinfo->cname, adest);
@@ -287 +304 @@
         dnsr_hostinfo_destroy(hinfo);
         return 0;
+        
 error:
         free(asrc);