Changeset 89ac5513 in mainline for uspace/app/nettest3/nettest3.c

Timestamp:

2013-06-23T19:54:53Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ddb1922

Parents:

3abf0760 (diff), 96cbd18 (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/nettest3/nettest3.c (modified) (3 diffs)

uspace/app/nettest3/nettest3.c

@@ -39 +39 @@
 #include <str.h>
 
+#include <inet/dnsr.h>
 #include <net/in.h>
 #include <net/in6.h>
@@ -60 +61 @@
         int fd;
         char *endptr;
+        dnsr_hostinfo_t *hinfo;
 
         port = 7;
@@ -75 +77 @@
                 rc = inet_pton(AF_INET, argv[1], (uint8_t *)&addr.sin_addr.s_addr);
                 if (rc != EOK) {
-                        fprintf(stderr, "Error parsing address\n");
-                        return 1;
+                        /* Try interpreting as a host name */
+                        rc = dnsr_name2host(argv[1], &hinfo);
+                        if (rc != EOK) {
+                                printf("Error resolving host '%s'.\n", argv[1]);
+                                return rc;
+                        }
+                        
+                        rc = inet_addr_sockaddr_in(&hinfo->addr, &addr);
+                        if (rc != EOK) {
+                                printf("Host '%s' not resolved as IPv4 address.\n", argv[1]);
+                                return rc;
+                        }
                 }
                 printf("result: rc=%d, family=%d, addr=%x\n", rc,