Changeset c42f50d in mainline for uspace/lib/http/src/http.c

Timestamp:

2013-10-05T11:53:43Z (12 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cbfc8b7

Parents:

408424e (diff), 3e896e1 (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/lib/http/src/http.c (modified) (2 diffs)

uspace/lib/http/src/http.c

@@ -86 +86 @@
                 /* Interpret as a host name */
                 dnsr_hostinfo_t *hinfo = NULL;
-                rc = dnsr_name2host(http->host, &hinfo, AF_NONE);
+                rc = dnsr_name2host(http->host, &hinfo, ip_any);
                 
                 if (rc != EOK)
@@ -95 +95 @@
         }
         
-        struct sockaddr_in addr;
-        struct sockaddr_in6 addr6;
-        uint16_t af = inet_addr_sockaddr_in(&http->addr, &addr, &addr6);
+        struct sockaddr *saddr;
+        socklen_t saddrlen;
         
-        http->conn_sd = socket(PF_INET, SOCK_STREAM, 0);
+        rc = inet_addr_sockaddr(&http->addr, http->port, &saddr, &saddrlen);
+        if (rc != EOK) {
+                assert(rc == ENOMEM);
+                return ENOMEM;
+        }
+        
+        http->conn_sd = socket(saddr->sa_family, SOCK_STREAM, 0);
         if (http->conn_sd < 0)
                 return http->conn_sd;
         
-        switch (af) {
-        case AF_INET:
-                addr.sin_port = htons(http->port);
-                rc = connect(http->conn_sd, (struct sockaddr *) &addr, sizeof(addr));
-                break;
-        case AF_INET6:
-                addr6.sin6_port = htons(http->port);
-                rc = connect(http->conn_sd, (struct sockaddr *) &addr6, sizeof(addr6));
-                break;
-        default:
-                return ENOTSUP;
-        }
+        rc = connect(http->conn_sd, saddr, saddrlen);
+        free(saddr);
         
         return rc;