Changes in uspace/app/nterm/conn.c [3e6a98c5:0aa70f4] in mainline

File:

• uspace/app/nterm/conn.c (modified) (4 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>
@@ -73 +75 @@
 int conn_open(const char *addr_s, const char *port_s)
 {
+        int conn_fd = -1;
+        
+        /* Interpret as address */
+        inet_addr_t addr_addr;
+        int rc = inet_addr_parse(addr_s, &addr_addr);
+        
+        if (rc != EOK) {
+                /* Interpret as a host name */
+                dnsr_hostinfo_t *hinfo = NULL;
+                rc = dnsr_name2host(addr_s, &hinfo, 0);
+                
+                if (rc != EOK) {
+                        printf("Error resolving host '%s'.\n", addr_s);
+                        goto error;
+                }
+                
+                addr_addr = hinfo->addr;
+        }
+        
         struct sockaddr_in addr;
-        int rc;
+        struct sockaddr_in6 addr6;
+        uint16_t af = inet_addr_sockaddr_in(&addr_addr, &addr, &addr6);
+        
         char *endptr;
-
-        addr.sin_family = AF_INET;
-
-        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;
-        }
-
-        addr.sin_port = htons(strtol(port_s, &endptr, 10));
+        uint16_t port = strtol(port_s, &endptr, 10);
         if (*endptr != '\0') {
                 printf("Invalid port number %s\n", port_s);
-                return EINVAL;
+                goto error;
         }
-
+        
+        printf("Connecting to host %s port %u\n", addr_s, port);
+        
         conn_fd = socket(PF_INET, SOCK_STREAM, 0);
         if (conn_fd < 0)
                 goto error;
-
-        printf("Connecting to address %s port %u\n", addr_s, ntohs(addr.sin_port));
-
-        rc = connect(conn_fd, (struct sockaddr *)&addr, sizeof(addr));
+        
+        switch (af) {
+        case AF_INET:
+                addr.sin_port = htons(port);
+                rc = connect(conn_fd, (struct sockaddr *) &addr, sizeof(addr));
+                break;
+        case AF_INET6:
+                addr6.sin6_port = htons(port);
+                rc = connect(conn_fd, (struct sockaddr *) &addr6, sizeof(addr6));
+                break;
+        default:
+                printf("Unknown address family.\n");
+                goto error;
+        }
+        
         if (rc != EOK)
                 goto error;
-
+        
         rcv_fid = fibril_create(rcv_fibril, NULL);
         if (rcv_fid == 0)
                 goto error;
-
+        
         fibril_add_ready(rcv_fid);
-
+        
         return EOK;
-
+        
 error:
         if (conn_fd >= 0) {
@@ -114 +141 @@
                 conn_fd = -1;
         }
-
+        
         return EIO;
 }
@@ -120 +147 @@
 int conn_send(void *data, size_t size)
 {
-        int rc;
-
-        rc = send(conn_fd, data, size, 0);
+        int rc = send(conn_fd, data, size, 0);
         if (rc != EOK)
                 return EIO;
-
+        
         return EOK;
 }