Re: [PATCH] [BZ #11438] getaddrinfo: map RFC 1918 addresses to global scope

[Andreas Schwab <schwab at linux-m68k dot org>]

"Dmitry V. Levin" <ldv@altlinux.org> writes:

> diff --git a/posix/gai.conf b/posix/gai.conf
> index 195287e..57a313d 100644
> --- a/posix/gai.conf
> +++ b/posix/gai.conf
> @@ -55,16 +55,13 @@
>  
>  #
>  # scopev4  <mask>  <value>
> -#    Add another rule to the RFC 3484 scope table for IPv4 addresses.
> -#    By default the scope IDs described in section 3.2 in RFC 3484 are
> +#    Add another rule to the RFC 6724 scope table for IPv4 addresses.
> +#    By default the scope IDs described in section 3.2 in RFC 6724 are
>  #    used.  Changing these defaults should hardly ever be necessary.
>  #    The defaults are equivalent to:
>  #
>  #scopev4 ::ffff:169.254.0.0/112  2
>  #scopev4 ::ffff:127.0.0.0/104    2
> -#scopev4 ::ffff:10.0.0.0/104     5
> -#scopev4 ::ffff:172.16.0.0/108   5
> -#scopev4 ::ffff:192.168.0.0/112  5
>  #scopev4 ::ffff:0.0.0.0/96       14
>  #
>  #    For sites which use site-local IPv4 addresses behind NAT there is

The comment starting here no longer make sense.

> diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
> index 05883bd..82c0b95 100644
> --- a/sysdeps/posix/getaddrinfo.c
> +++ b/sysdeps/posix/getaddrinfo.c
> @@ -1370,9 +1370,6 @@ static const struct scopeentry
>      { { { 169, 254, 0, 0 } }, htonl_c (0xffff0000), 2 },
>      { { { 127, 0, 0, 0 } }, htonl_c (0xff000000), 2 },
>      /* Site-local addresses: scope 5.  */
> -    { { { 10, 0, 0, 0 } }, htonl_c (0xff000000), 5 },
> -    { { { 172, 16, 0, 0 } }, htonl_c (0xfff00000), 5 },
> -    { { { 192, 168, 0, 0 } }, htonl_c (0xffff0000), 5 },

The comment no longer makes sense.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."