generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 2e23e292: Backport (simple cherry-pick) d33019030c1f0cddca557f9659e3c471bde0e6a9 to gingerbread.

Browse Source 
* commit '2e23e29245aa42d0f9419187c94e72dba3888eef':
  Backport (simple cherry-pick) d33019030c1f0cddca557f9659e3c471bde0e6a9 to gingerbread.
This commit is contained in:
Steinar H. Gunderson 2011-01-17 12:15:45 -08:00 committed by Android Git Automerger
commit 2be18508f3
1 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
libc/netbsd/net/getaddrinfo.c
View File

@ -1327,9 +1327,13 @@ _get_scope(const struct sockaddr *addr)
#define IN6_IS_ADDR_6TO4(a) \ #define IN6_IS_ADDR_6TO4(a) \
(((a)->s6_addr[0] == 0x20) && ((a)->s6_addr[1] == 0x02)) (((a)->s6_addr[0] == 0x20) && ((a)->s6_addr[1] == 0x02))
/* 6bone testing address area (3ffe::/16), deprecated in RFC 3701. */
#define IN6_IS_ADDR_6BONE(a) \
(((a)->s6_addr[0] == 0x3f) && ((a)->s6_addr[1] == 0xfe))
/* /*
* Get the label for a given IPv4/IPv6 address. * Get the label for a given IPv4/IPv6 address.
* RFC 3484, section 2.1, plus Teredo added in with label 5. * RFC 3484, section 2.1, plus changes from draft-ietf-6man-rfc3484-revise-01.
*/ */
/*ARGSUSED*/ /*ARGSUSED*/
@ -1337,19 +1341,27 @@ static int
_get_label(const struct sockaddr *addr) _get_label(const struct sockaddr *addr)
{ {
if (addr->sa_family == AF_INET) { if (addr->sa_family == AF_INET) {
return 4; return 3;
} else if (addr->sa_family == AF_INET6) { } 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)) { if (IN6_IS_ADDR_LOOPBACK(&addr6->sin6_addr)) {
return 0; return 0;
} else if (IN6_IS_ADDR_V4COMPAT(&addr6->sin6_addr)) { } else if (IN6_IS_ADDR_ULA(&addr6->sin6_addr)) {
return 1;
} else if (IN6_IS_ADDR_V4MAPPED(&addr6->sin6_addr)) {
return 3; return 3;
} else if (IN6_IS_ADDR_6TO4(&addr6->sin6_addr)) {
return 4;
} else if (IN6_IS_ADDR_TEREDO(&addr6->sin6_addr)) { } else if (IN6_IS_ADDR_TEREDO(&addr6->sin6_addr)) {
return 5; return 5;
} else if (IN6_IS_ADDR_6TO4(&addr6->sin6_addr)) { } else if (IN6_IS_ADDR_V4COMPAT(&addr6->sin6_addr)) {
return 2; return 10;
} else if (IN6_IS_ADDR_SITELOCAL(&addr6->sin6_addr)) {
return 11;
} else if (IN6_IS_ADDR_6BONE(&addr6->sin6_addr)) {
return 12;
} else { } else {
return 1; return 2;
} }
} else { } else {
/* /*
@ -1362,7 +1374,7 @@ _get_label(const struct sockaddr *addr)
/* /*
* Get the precedence for a given IPv4/IPv6 address. * Get the precedence for a given IPv4/IPv6 address.
* RFC 3484, section 2.1, plus Teredo added in with precedence 25. * RFC 3484, section 2.1, plus changes from draft-ietf-6man-rfc3484-revise-01.
*/ */
/*ARGSUSED*/ /*ARGSUSED*/
@ -1370,22 +1382,28 @@ static int
_get_precedence(const struct sockaddr *addr) _get_precedence(const struct sockaddr *addr)
{ {
if (addr->sa_family == AF_INET) { if (addr->sa_family == AF_INET) {
return 10; return 30;
} else if (addr->sa_family == AF_INET6) { } 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)) { if (IN6_IS_ADDR_LOOPBACK(&addr6->sin6_addr)) {
return 60;
} else if (IN6_IS_ADDR_ULA(&addr6->sin6_addr)) {
return 50; return 50;
} else if (IN6_IS_ADDR_V4COMPAT(&addr6->sin6_addr)) { } else if (IN6_IS_ADDR_V4MAPPED(&addr6->sin6_addr)) {
return 30;
} else if (IN6_IS_ADDR_6TO4(&addr6->sin6_addr)) {
return 20; return 20;
} else if (IN6_IS_ADDR_TEREDO(&addr6->sin6_addr)) { } else if (IN6_IS_ADDR_TEREDO(&addr6->sin6_addr)) {
return 25; return 10;
} else if (IN6_IS_ADDR_6TO4(&addr6->sin6_addr)) { } else if (IN6_IS_ADDR_V4COMPAT(&addr6->sin6_addr) ||
return 30; IN6_IS_ADDR_SITELOCAL(&addr6->sin6_addr) ||
IN6_IS_ADDR_6BONE(&addr6->sin6_addr)) {
return 1;
} else { } else {
return 40; return 40;
} }
} else { } else {
return 5; return 1;
} }
} }