Changeset b8e72fd1 in mainline for uspace/app/nettest1/nettest1.c

Timestamp:

2013-05-30T17:13:02Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

98abd40

Parents:

be2bb4f (diff), 94dfb92 (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/nettest1/nettest1.c (modified) (5 diffs)

uspace/app/nettest1/nettest1.c

@@ -46 +46 @@
 #include <arg_parse.h>
 
+#include <inet/dnsr.h>
 #include <net/in.h>
 #include <net/in6.h>
@@ -75 +76 @@
         printf(
             "Network Networking test 1 aplication - sockets\n"
-            "Usage: echo [options] numeric_address\n"
+            "Usage: nettest1 [options] host\n"
             "Where options are:\n"
             "-f protocol_family | --family=protocol_family\n"
@@ -290 +291 @@
         struct sockaddr_in address_in;
         struct sockaddr_in6 address_in6;
+        dnsr_hostinfo_t *hinfo;
         uint8_t *address_start;
 
@@ -319 +321 @@
         }
 
-        /* If not before the last argument containing the address */
+        /* If not before the last argument containing the host */
         if (index >= argc) {
-                printf("Command line error: missing address\n");
+                printf("Command line error: missing host name\n");
                 nettest1_print_help();
                 return EINVAL;
@@ -348 +350 @@
         }
 
-        /* Parse the last argument which should contain the address */
+        /* Parse the last argument which should contain the host/address */
         rc = inet_pton(family, argv[argc - 1], address_start);
         if (rc != EOK) {
-                fprintf(stderr, "Address parse error %d\n", rc);
-                return rc;
+                /* Try interpreting as a host name */
+                rc = dnsr_name2host(argv[argc - 1], &hinfo);
+                if (rc != EOK) {
+                        printf("Error resolving host '%s'.\n", argv[argc - 1]);
+                        return rc;
+                }
+
+                address_in.sin_addr.s_addr = host2uint32_t_be(hinfo->addr.ipv4);
         }