Changeset 4e716180 in mainline for uspace/app/nterm/conn.c

Timestamp:

2013-05-03T21:14:39Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

716357f

Parents:

1c7ba2d (diff), 5d1cb8a (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 simple DNS resolver.

File:

• uspace/app/nterm/conn.c (modified) (5 diffs)

uspace/app/nterm/conn.c

@@ -33 +33 @@
  */
 
+#include <byteorder.h>
 #include <stdbool.h>
 #include <errno.h>
 #include <fibril.h>
+#include <inet/dnsr.h>
 #include <net/socket.h>
 #include <stdio.h>
@@ -74 +76 @@
 {
         struct sockaddr_in addr;
+        dnsr_hostinfo_t *hinfo = NULL;
         int rc;
         char *endptr;
@@ -81 +84 @@
         rc = inet_pton(addr.sin_family, addr_s, (uint8_t *)&addr.sin_addr);
         if (rc != EOK) {
-                printf("Invalid addres %s\n", addr_s);
-                return EINVAL;
+                /* Try interpreting as a host name */
+                rc = dnsr_name2host(addr_s, &hinfo);
+                if (rc != EOK) {
+                        printf("Error resolving host '%s'.\n", addr_s);
+                        goto error;
+                }
+
+                addr.sin_addr.s_addr = host2uint32_t_be(hinfo->addr.ipv4);
         }
 
@@ -88 +97 @@
         if (*endptr != '\0') {
                 printf("Invalid port number %s\n", port_s);
-                return EINVAL;
+                goto error;
         }
 
@@ -95 +104 @@
                 goto error;
 
-        printf("Connecting to address %s port %u\n", addr_s, ntohs(addr.sin_port));
+        printf("Connecting to host %s port %u\n", addr_s, ntohs(addr.sin_port));
 
         rc = connect(conn_fd, (struct sockaddr *)&addr, sizeof(addr));