Changeset 26de91a in mainline for uspace/lib

Timestamp:

2013-10-04T17:19:20Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9749e47

Parents:

e2839d7

Message:

IPv4 and v6 should not need separate handling by a simple client that is just connecting to a host/address. Add IPv6/DNS support in applications where missing.

Location:

uspace/lib

Files:

• c/generic/inet/addr.c (modified) (1 diff)
• c/include/inet/addr.h (modified) (2 diffs)
• http/http.c (modified) (1 diff)

uspace/lib/c/generic/inet/addr.c

@@ -636 +636 @@
 }
 
+int inet_addr_sockaddr(const inet_addr_t *addr, uint16_t port,
+    sockaddr_t **nsockaddr, socklen_t *naddrlen)
+{
+        sockaddr_in_t *sa4;
+        sockaddr_in6_t *sa6;
+
+        switch (addr->version) {
+        case ip_v4:
+                sa4 = calloc(1, sizeof(sockaddr_in_t));
+                if (sa4 == NULL)
+                        return ENOMEM;
+
+                sa4->sin_family = AF_INET;
+                sa4->sin_port = host2uint16_t_be(port);
+                sa4->sin_addr.s_addr = host2uint32_t_be(addr->addr);
+                if (nsockaddr != NULL)
+                        *nsockaddr = (sockaddr_t *)sa4;
+                if (naddrlen != NULL)
+                        *naddrlen = sizeof(*sa4);
+                break;
+        case ip_v6:
+                sa6 = calloc(1, sizeof(sockaddr_in6_t));
+                if (sa6 == NULL)
+                        return ENOMEM;
+
+                sa6->sin6_family = AF_INET6;
+                sa6->sin6_port = host2uint16_t_be(port);
+                host2addr128_t_be(addr->addr6, sa6->sin6_addr.s6_addr);
+                if (nsockaddr != NULL)
+                        *nsockaddr = (sockaddr_t *)sa6;
+                if (naddrlen != NULL)
+                        *naddrlen = sizeof(*sa6);
+                break;
+        default:
+                assert(false);
+                break;
+        }
+
+        return EOK;
+}
+
 /** @}
  */

uspace/lib/c/include/inet/addr.h

@@ -39 +39 @@
 #include <net/in.h>
 #include <net/in6.h>
+#include <net/socket.h>
 
 typedef uint32_t addr32_t;
@@ -135 +136 @@
 
 extern ip_ver_t ipver_from_af(int af);
+extern int inet_addr_sockaddr(const inet_addr_t *, uint16_t, sockaddr_t **,
+    socklen_t *);
 
 #endif

uspace/lib/http/http.c

@@ -174 +174 @@
         }
         
-        struct sockaddr_in addr;
-        struct sockaddr_in6 addr6;
-        uint16_t af = inet_addr_sockaddr_in(&http->addr, &addr, &addr6);
-        
-        http->conn_sd = socket(PF_INET, SOCK_STREAM, 0);
+        struct sockaddr *saddr;
+        socklen_t saddrlen;
+        
+        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;