Update getaddrinfo to RFC6724
Currently, our getaddrinfo implementation does not conform to
any IETF standard. It follows draft-ietf-6man-rfc3484-revise-01,
but that draft has expired. Update the policy table to RFC6724.
(cherry-pick of e919b116d35aa7deb24ddece69c491e24c3b0d6f.)
Bug: 8276725
Change-Id: I2d17122defd966ac6c2c13d04887fb110f2598a0
diff --git a/libc/netbsd/net/getaddrinfo.c b/libc/netbsd/net/getaddrinfo.c
index 326b09c..e706e6a 100644
--- a/libc/netbsd/net/getaddrinfo.c
+++ b/libc/netbsd/net/getaddrinfo.c
@@ -1527,10 +1527,8 @@
return IPV6_ADDR_SCOPE_LINKLOCAL;
} else {
/*
- * According to draft-ietf-6man-rfc3484-revise-01 section 2.3,
- * it is best not to treat the private IPv4 ranges
- * (10.0.0.0/8, 172.16.0.0/12 and 192.168.0.0/16) as being
- * in a special scope, so we don't.
+ * RFC 6724 section 3.2. Other IPv4 addresses, including private addresses
+ * and shared addresses (100.64.0.0/10), are assigned global scope.
*/
return IPV6_ADDR_SCOPE_GLOBAL;
}
@@ -1559,7 +1557,7 @@
/*
* Get the label for a given IPv4/IPv6 address.
- * RFC 3484, section 2.1, plus changes from draft-ietf-6man-rfc3484-revise-01.
+ * RFC 6724, section 2.1.
*/
/*ARGSUSED*/
@@ -1567,27 +1565,28 @@
_get_label(const struct sockaddr *addr)
{
if (addr->sa_family == AF_INET) {
- return 3;
+ return 4;
} else if (addr->sa_family == AF_INET6) {
- const struct sockaddr_in6 *addr6 = (const struct sockaddr_in6 *)addr;
+ const struct sockaddr_in6 *addr6 = (const struct sockaddr_in6 *) addr;
if (IN6_IS_ADDR_LOOPBACK(&addr6->sin6_addr)) {
return 0;
- } else if (IN6_IS_ADDR_ULA(&addr6->sin6_addr)) {
- return 1;
} else if (IN6_IS_ADDR_V4MAPPED(&addr6->sin6_addr)) {
- return 3;
- } else if (IN6_IS_ADDR_6TO4(&addr6->sin6_addr)) {
return 4;
+ } else if (IN6_IS_ADDR_6TO4(&addr6->sin6_addr)) {
+ return 2;
} else if (IN6_IS_ADDR_TEREDO(&addr6->sin6_addr)) {
return 5;
+ } else if (IN6_IS_ADDR_ULA(&addr6->sin6_addr)) {
+ return 13;
} else if (IN6_IS_ADDR_V4COMPAT(&addr6->sin6_addr)) {
- return 10;
+ return 3;
} else if (IN6_IS_ADDR_SITELOCAL(&addr6->sin6_addr)) {
return 11;
} else if (IN6_IS_ADDR_6BONE(&addr6->sin6_addr)) {
return 12;
} else {
- return 2;
+ /* All other IPv6 addresses, including global unicast addresses. */
+ return 1;
}
} else {
/*
@@ -1600,7 +1599,7 @@
/*
* Get the precedence for a given IPv4/IPv6 address.
- * RFC 3484, section 2.1, plus changes from draft-ietf-6man-rfc3484-revise-01.
+ * RFC 6724, section 2.1.
*/
/*ARGSUSED*/
@@ -1608,24 +1607,25 @@
_get_precedence(const struct sockaddr *addr)
{
if (addr->sa_family == AF_INET) {
- return 30;
+ return 35;
} else if (addr->sa_family == AF_INET6) {
const struct sockaddr_in6 *addr6 = (const struct sockaddr_in6 *)addr;
if (IN6_IS_ADDR_LOOPBACK(&addr6->sin6_addr)) {
- return 60;
- } else if (IN6_IS_ADDR_ULA(&addr6->sin6_addr)) {
return 50;
} else if (IN6_IS_ADDR_V4MAPPED(&addr6->sin6_addr)) {
- return 30;
+ return 35;
} else if (IN6_IS_ADDR_6TO4(&addr6->sin6_addr)) {
- return 20;
+ return 30;
} else if (IN6_IS_ADDR_TEREDO(&addr6->sin6_addr)) {
- return 10;
+ return 5;
+ } else if (IN6_IS_ADDR_ULA(&addr6->sin6_addr)) {
+ return 3;
} else if (IN6_IS_ADDR_V4COMPAT(&addr6->sin6_addr) ||
IN6_IS_ADDR_SITELOCAL(&addr6->sin6_addr) ||
IN6_IS_ADDR_6BONE(&addr6->sin6_addr)) {
return 1;
} else {
+ /* All other IPv6 addresses, including global unicast addresses. */
return 40;
}
} else {
@@ -1664,12 +1664,12 @@
/*
* Compare two source/destination address pairs.
- * RFC 3484, section 6.
+ * RFC 6724, section 6.
*/
/*ARGSUSED*/
static int
-_rfc3484_compare(const void *ptr1, const void* ptr2)
+_rfc6724_compare(const void *ptr1, const void* ptr2)
{
const struct addrinfo_sort_elem *a1 = (const struct addrinfo_sort_elem *)ptr1;
const struct addrinfo_sort_elem *a2 = (const struct addrinfo_sort_elem *)ptr2;
@@ -1740,7 +1740,7 @@
/*
* Rule 9: Use longest matching prefix.
- * We implement this for IPv6 only, as the rules in RFC 3484 don't seem
+ * We implement this for IPv6 only, as the rules in RFC 6724 don't seem
* to work very well directly applied to IPv4. (glibc uses information from
* the routing table for a custom IPv4 implementation here.)
*/
@@ -1820,13 +1820,13 @@
}
/*
- * Sort the linked list starting at sentinel->ai_next in RFC3484 order.
+ * Sort the linked list starting at sentinel->ai_next in RFC6724 order.
* Will leave the list unchanged if an error occurs.
*/
/*ARGSUSED*/
static void
-_rfc3484_sort(struct addrinfo *list_sentinel)
+_rfc6724_sort(struct addrinfo *list_sentinel)
{
struct addrinfo *cur;
int nelem = 0, i;
@@ -1861,7 +1861,7 @@
}
/* Sort the addresses, and rearrange the linked list so it matches the sorted order. */
- qsort((void *)elems, nelem, sizeof(struct addrinfo_sort_elem), _rfc3484_compare);
+ qsort((void *)elems, nelem, sizeof(struct addrinfo_sort_elem), _rfc6724_compare);
list_sentinel->ai_next = elems[0].ai;
for (i = 0; i < nelem - 1; ++i) {
@@ -2012,7 +2012,7 @@
}
}
- _rfc3484_sort(&sentinel);
+ _rfc6724_sort(&sentinel);
__res_put_state(res);
