mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-21 01:12:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

[BZ #4102]

Browse Source 
2007-04-28  Ulrich Drepper  <drepper@redhat.com>
	[BZ #4102]
	* sysdeps/posix/getaddrinfo.c (default_labels): Assign separate
	label to Teredo tunnel addresses 2001://32.
This commit is contained in:
Ulrich Drepper 2007-04-28 16:09:22 +00:00
parent 762422d1bd
commit e53f0f51a6
2 changed files with 83 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2007-04-28 Ulrich Drepper <drepper@redhat.com>
[BZ #4102]
* sysdeps/posix/getaddrinfo.c (default_labels): Assign separate
label to Teredo tunnel addresses 2001://32.
2007-04-27 Ulrich Drepper <drepper@redhat.com>
* locale/programs/ld-collate.c (collate_read): Allow order_start

82
sysdeps/posix/getaddrinfo.c
View File

@ -61,6 +61,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <nscd/nscd-client.h>
#include <nscd/nscd_proto.h>
#ifdef HAVE_NETLINK_ROUTE
# include <kernel-features.h>
#endif
#ifdef HAVE_LIBIDN
extern int __idna_to_ascii_lz (const char *input, char **output, int flags);
extern int __idna_to_unicode_lzlz (const char *input, char **output,
@ -1094,6 +1098,10 @@ static const struct prefixentry default_labels[] =
= { .u6_addr8 = { 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
7, 6 },
{ { .in6_u
= { .u6_addr8 = { 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
32, 7 },
{ { .in6_u
= { .u6_addr8 = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } },
@ -1728,6 +1736,16 @@ gaiconf_reload (void)
}
#if HAVE_NETLINK_ROUTE
# if __ASSUME_NETLINK_SUPPORT == 0
/* Defined in ifaddrs.c. */
extern int __no_netlink_support attribute_hidden;
# else
# define __no_netlink_support 0
# endif
#endif
int
getaddrinfo (const char *name, const char *service,
const struct addrinfo *hints, struct addrinfo **pai)
@ -1763,20 +1781,74 @@ getaddrinfo (const char *name, const char *service,
return EAI_BADFLAGS;
struct in6addrinfo *in6ai = NULL;
size_t in6ailen;
size_t in6ailen = 0;
bool seen_ipv4 = false;
bool seen_ipv6 = false;
#ifdef HAVE_NETLINK_ROUTE
int sockfd = -1;
pid_t nl_pid;
#endif
/* We might need information about what kind of interfaces are available.
But even if AI_ADDRCONFIG is not used, if the user requested IPv6
addresses we have to know whether an address is deprecated or
temporary. */
if ((hints->ai_flags & AI_ADDRCONFIG) || hints->ai_family == PF_UNSPEC
|| hints->ai_family == PF_INET6)
/* Determine whether we have IPv4 or IPv6 interfaces or both. We
cannot cache the results since new interfaces could be added at
any time. */
__check_pf (&seen_ipv4, &seen_ipv6, &in6ai, &in6ailen);
{
/* Determine whether we have IPv4 or IPv6 interfaces or both. We
cannot cache the results since new interfaces could be added at
any time. */
__check_pf (&seen_ipv4, &seen_ipv6, &in6ai, &in6ailen);
#ifdef HAVE_NETLINK_ROUTE
if (! __no_netlink_support)
{
sockfd = __socket (PF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
struct sockaddr_nl nladdr;
memset (&nladdr, '\0', sizeof (nladdr));
nladdr.nl_family = AF_NETLINK;
socklen_t addr_len = sizeof (nladdr);
if (sockfd >= 0
&& __bind (fd, (struct sockaddr *) &nladdr, sizeof (nladdr)) == 0
&& __getsockname (sockfd, (struct sockaddr *) &nladdr,
&addr_len) == 0
&& make_request (sockfd, nladdr.nl_pid, &seen_ipv4, &seen_ipv6,
in6ai, in6ailen) == 0)
{
/* It worked. */
nl_pid = nladdr.nl_pid;
goto got_netlink_socket;
}
if (sockfd >= 0)
close_not_cancel_no_status (sockfd);
#if __ASSUME_NETLINK_SUPPORT == 0
/* Remember that there is no netlink support. */
if (errno != EMFILE && errno != ENFILE)
__no_netlink_support = 1;
#else
else
{
if (errno != EMFILE && errno != ENFILE)
sockfd = -2;
/* We cannot determine what interfaces are available. Be
pessimistic. */
seen_ipv4 = true;
seen_ipv6 = true;
return;
}
#endif
}
#endif
}
#ifdef HAVE_NETLINK_ROUTE
got_netlink_socket:
#endif
if (hints->ai_flags & AI_ADDRCONFIG)
{
/* Now make a decision on what we return, if anything. */