AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-10 15:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

* sysdeps/posix/getaddrinfo.c (default_labels): Adjust for change

Browse Source 
of names of in in6_addr.
	(default_precedence): Likewise.
	* sysdeps/unix/sysv/linux/cmsg_nxthdr.c: Include <stddef.h> for
	NULL definition.
This commit is contained in:
Ulrich Drepper 2008-01-16 19:47:17 +00:00
parent a53d3f8295
commit 6107639e64
3 changed files with 59 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -26,6 +26,11 @@
* sysdeps/unix/sysv/linux/bits/in.h: Likewise. * sysdeps/unix/sysv/linux/bits/in.h: Likewise.
* sysdeps/unix/sysv/linux/bits/socket.h: Likewise. * sysdeps/unix/sysv/linux/bits/socket.h: Likewise.
* sysdeps/unix/sysv/linux/x86_64/bits/stat.h: Likewise. * sysdeps/unix/sysv/linux/x86_64/bits/stat.h: Likewise.
* sysdeps/posix/getaddrinfo.c (default_labels): Adjust for change
of names of in in6_addr.
(default_precedence): Likewise.
* sysdeps/unix/sysv/linux/cmsg_nxthdr.c: Include <stddef.h> for
NULL definition.
2008-01-15 Ulrich Drepper <drepper@redhat.com> 2008-01-15 Ulrich Drepper <drepper@redhat.com>

104
sysdeps/posix/getaddrinfo.c
View File

@ -1105,22 +1105,22 @@ static const struct prefixentry *labels;
static const struct prefixentry default_labels[] = static const struct prefixentry default_labels[] =
{ {
/* See RFC 3484 for the details. */ /* See RFC 3484 for the details. */
{ { .in6_u { { .__in6_u
= { .u6_addr8 = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, = { .__u6_addr8 = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 } } }, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 } }
128, 0 }, }, 128, 0 },
{ { .in6_u { { .__in6_u
= { .u6_addr8 = { 0x20, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, = { .__u6_addr8 = { 0x20, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } }, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } }
16, 2 }, }, 16, 2 },
{ { .in6_u { { .__in6_u
= { .u6_addr8 = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, = { .__u6_addr8 = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } }, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } }
96, 3 }, }, 96, 3 },
{ { .in6_u { { .__in6_u
= { .u6_addr8 = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, = { .__u6_addr8 = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 } } }, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 } }
96, 4 }, }, 96, 4 },
/* The next two entries differ from RFC 3484. We need to treat /* The next two entries differ from RFC 3484. We need to treat
IPv6 site-local addresses special because they are never NATed, IPv6 site-local addresses special because they are never NATed,
unlike site-locale IPv4 addresses. If this would not happen, on unlike site-locale IPv4 addresses. If this would not happen, on
@ -1128,23 +1128,23 @@ static const struct prefixentry default_labels[] =
sorting would prefer the IPv6 site-local addresses, causing sorting would prefer the IPv6 site-local addresses, causing
unnecessary delays when trying to connect to a global IPv6 address unnecessary delays when trying to connect to a global IPv6 address
through a site-local IPv6 address. */ through a site-local IPv6 address. */
{ { .in6_u { { .__in6_u
= { .u6_addr8 = { 0xfe, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, = { .__u6_addr8 = { 0xfe, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } }, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } }
10, 5 }, }, 10, 5 },
{ { .in6_u { { .__in6_u
= { .u6_addr8 = { 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, = { .__u6_addr8 = { 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } }, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } }
7, 6 }, }, 7, 6 },
/* Additional rule for Teredo tunnels. */ /* Additional rule for Teredo tunnels. */
{ { .in6_u { { .__in6_u
= { .u6_addr8 = { 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, = { .__u6_addr8 = { 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } }, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } }
32, 7 }, }, 32, 7 },
{ { .in6_u { { .__in6_u
= { .u6_addr8 = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, = { .__u6_addr8 = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } }, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } }
0, 1 } }, 0, 1 }
}; };
@ -1155,26 +1155,26 @@ static const struct prefixentry *precedence;
static const struct prefixentry default_precedence[] = static const struct prefixentry default_precedence[] =
{ {
/* See RFC 3484 for the details. */ /* See RFC 3484 for the details. */
{ { .in6_u { { .__in6_u
= { .u6_addr8 = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, = { .__u6_addr8 = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 } } }, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 } }
128, 50 }, }, 128, 50 },
{ { .in6_u { { .__in6_u
= { .u6_addr8 = { 0x20, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, = { .__u6_addr8 = { 0x20, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } }, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } }
16, 30 }, }, 16, 30 },
{ { .in6_u { { .__in6_u
= { .u6_addr8 = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, = { .__u6_addr8 = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } }, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } }
96, 20 }, }, 96, 20 },
{ { .in6_u { { .__in6_u
= { .u6_addr8 = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, = { .__u6_addr8 = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 } } }, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 } }
96, 10 }, }, 96, 10 },
{ { .in6_u { { .__in6_u
= { .u6_addr8 = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, = { .__u6_addr8 = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } } }, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } }
0, 40 } }, 0, 40 }
}; };

3
sysdeps/unix/sysv/linux/cmsg_nxthdr.c
View File

@ -1,5 +1,5 @@
/* Return point to next ancillary data entry in message header. /* Return point to next ancillary data entry in message header.
Copyright (C) 1997, 1998, 2001 Free Software Foundation, Inc. Copyright (C) 1997, 1998, 2001, 2008 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -17,6 +17,7 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */ 02111-1307 USA. */
#include <stddef.h>
#include <sys/socket.h> #include <sys/socket.h>