Changeset 26de91a in mainline for uspace/lib/c/generic/inet/addr.c

Timestamp:

2013-10-04T17:19:20Z (11 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.

File:

• uspace/lib/c/generic/inet/addr.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;
+}
+
 /** @}
  */