AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-22 19:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

inet: __inet6_scopeid_pton should accept node-local addresses [BZ #21657]

Browse Source
This commit is contained in:
Benjamin Cama 2017-06-22 15:49:28 +02:00 committed by Florian Weimer
parent 0a47d031e4
commit f768b45020
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2017-06-21 Benjamin Cama <b.cama@kerlink.fr>
[BZ #21657]
* inet/inet6_scopeid_pton.c (__inet6_scopeid_pton): Permit scopes
on node-local addresses.
* inet/tst-inet6_scopeid_pton.c (do_test): Adjust test.
2017-06-21 Florian Weimer <fweimer@redhat.com> 2017-06-21 Florian Weimer <fweimer@redhat.com>
* intl/loadmsgcat.c: Remove alloca support. * intl/loadmsgcat.c: Remove alloca support.

1
inet/inet6_scopeid_pton.c
View File

@ -33,6 +33,7 @@ __inet6_scopeid_pton (const struct in6_addr *address, const char *scope,
uint32_t *result) uint32_t *result)
{ {
if (IN6_IS_ADDR_LINKLOCAL (address) if (IN6_IS_ADDR_LINKLOCAL (address)
|| IN6_IS_ADDR_MC_NODELOCAL (address)
|| IN6_IS_ADDR_MC_LINKLOCAL (address)) || IN6_IS_ADDR_MC_LINKLOCAL (address))
{ {
uint32_t number = __if_nametoindex (scope); uint32_t number = __if_nametoindex (scope);

2
inet/tst-inet6_scopeid_pton.c
View File

@ -218,9 +218,9 @@ do_test (void)
{ {
expect_success ("fe80::1", interface_name, interface_index); expect_success ("fe80::1", interface_name, interface_index);
expect_success ("ff02::1", interface_name, interface_index); expect_success ("ff02::1", interface_name, interface_index);
expect_success ("ff01::1", interface_name, interface_index);
expect_failure ("::", interface_name); expect_failure ("::", interface_name);
expect_failure ("::1", interface_name); expect_failure ("::1", interface_name);
expect_failure ("ff01::1", interface_name);
expect_failure ("2001:db8::1", interface_name); expect_failure ("2001:db8::1", interface_name);
} }