Changeset 98abd40 in mainline for uspace/app/nterm/conn.c

Timestamp:

2013-07-06T21:57:22Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c8bb1633, cdc8a391

Parents:

b8e72fd1 (diff), 507c6f3 (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/nterm/conn.c (modified) (3 diffs)

uspace/app/nterm/conn.c

@@ -75 +75 @@
 int conn_open(const char *addr_s, const char *port_s)
 {
-        struct sockaddr_in addr;
-        dnsr_hostinfo_t *hinfo = NULL;
-        int rc;
-        char *endptr;
-
-        addr.sin_family = AF_INET;
-
-        rc = inet_pton(addr.sin_family, addr_s, (uint8_t *)&addr.sin_addr);
+        int conn_fd = -1;
+        
+        /* Interpret as address */
+        inet_addr_t addr_addr;
+        int rc = inet_addr_parse(addr_s, &addr_addr);
+        
         if (rc != EOK) {
-                /* Try interpreting as a host name */
+                /* Interpret as a host name */
+                dnsr_hostinfo_t *hinfo = NULL;
                 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);
+                
+                addr_addr = hinfo->addr;
         }
-
-        addr.sin_port = htons(strtol(port_s, &endptr, 10));
+        
+        struct sockaddr_in addr;
+        struct sockaddr_in6 addr6;
+        uint16_t af = inet_addr_sockaddr_in(&addr_addr, &addr, &addr6);
+        
+        char *endptr;
+        uint16_t port = strtol(port_s, &endptr, 10);
         if (*endptr != '\0') {
                 printf("Invalid port number %s\n", port_s);
                 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 host %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) {
@@ -123 +141 @@
                 conn_fd = -1;
         }
-
+        
         return EIO;
 }
@@ -129 +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;
 }