Changeset 4c14b88 in mainline for uspace/app/ping/ping.c

Timestamp:

2013-12-31T07:57:14Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1b973dc

Parents:

6297465 (diff), 208b5f5 (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:

mainline changes

File:

• uspace/app/ping/ping.c (modified) (8 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>
@@ -77 +76 @@
 };
 
-static addr32_t src;
-static addr32_t dest;
+static inet_addr_t src_addr;
+static inet_addr_t dest_addr;
 
 static bool repeat_forever = false;
 static size_t repeat_count = 1;
 
-static const char *short_options = "rn:";
+static const char *short_options = "46rn:";
 
 static void print_syntax(void)
 {
-        printf("Syntax: %s [-n <count>|-r] <host>\n", NAME);
+        printf("Syntax: %s [<options>] <host>\n", NAME);
+        printf("\t-n <count> Repeat the specified number of times\n");
+        printf("\t-r         Repeat forever\n");
+        printf("\t-4|-6      Use IPv4 or IPv6 destination host address\n");
 }
 
@@ -108 +110 @@
 static int ping_ev_recv(inetping_sdu_t *sdu)
 {
-        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);
@@ -140 +136 @@
         inetping_sdu_t sdu;
         
-        sdu.src = src;
-        sdu.dest = dest;
+        sdu.src = src_addr;
+        sdu.dest = dest_addr;
         sdu.seq_no = seq_no;
         sdu.data = (void *) "foo";
@@ -222 +218 @@
         char *adest = NULL;
         char *sdest = NULL;
+        ip_ver_t ip_ver = ip_any;
         
         int rc = inetping_init(&ev_ops);
@@ -244 +241 @@
                         }
                         break;
+                case '4':
+                        ip_ver = ip_v4;
+                        break;
+                case '6':
+                        ip_ver = ip_v6;
+                        break;
                 default:
                         printf("Unknown option passed.\n");
@@ -258 +261 @@
         
         /* Parse destination address */
-        inet_addr_t dest_addr;
         rc = inet_addr_parse(argv[optind], &dest_addr);
         if (rc != EOK) {
                 /* Try interpreting as a host name */
-                rc = dnsr_name2host(argv[optind], &hinfo, AF_INET);
+                rc = dnsr_name2host(argv[optind], &hinfo, ip_ver);
                 if (rc != EOK) {
                         printf("Error resolving host '%s'.\n", argv[optind]);
@@ -271 +273 @@
         }
         
-        uint16_t af = inet_addr_get(&dest_addr, &dest, NULL);
-        if (af != AF_INET) {
-                printf("Destination '%s' is not an IPv4 address.\n",
-                    argv[optind]);
-                goto error;
-        }
-        
         /* Determine source address */
-        rc = inetping_get_srcaddr(dest, &src);
+        rc = inetping_get_srcaddr(&dest_addr, &src_addr);
         if (rc != EOK) {
                 printf("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);