diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2007-11-14 06:58:35 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2007-11-14 06:58:35 +0000 |
| commit | 773e79b3162dff01e080cb152ff77945244f5a17 (patch) | |
| tree | c5b1f11c79b36c6c1d02e80b0f6e00274ea6e586 /sysdeps/unix/sysv/linux/check_pf.c | |
| parent | e458144c99ddc00769ffa6bd367c21d37e879d83 (diff) | |
| download | glibc-773e79b3162dff01e080cb152ff77945244f5a17.tar.gz glibc-773e79b3162dff01e080cb152ff77945244f5a17.tar.xz glibc-773e79b3162dff01e080cb152ff77945244f5a17.zip | |
* include/ifaddrs.h: Remove in6ai_temporary.
(struct in6addrinfo): Add index element. Declare __check_native. * inet/Makefile (aux): Add check_native. * sysdeps/unix/sysv/linux/check_native.c: New file. * sysdeps/unix/sysv/linux/check_pf.c: No need to recognize IFA_F_TEMPORARY. Pass back ifa_index. * sysdeps/posix/getaddrinfo.c: Remove netlink compatibility code. (rfc3484_sort): Add new parameter. Implement rule 7 correctly: call __check_native if necessary. (getaddrinfo): Fill in index field. Use qsort_r instead of qsort to sort addresses. Pass information about the results. * posix/tst-rfc3484.c: Adjust for addition of index field and change of rfc3484_sort interface. * posix/tst-rfc3484-2.c: Likewise.
Diffstat (limited to 'sysdeps/unix/sysv/linux/check_pf.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/check_pf.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sysdeps/unix/sysv/linux/check_pf.c b/sysdeps/unix/sysv/linux/check_pf.c index 532e1d923d..b7556aebc5 100644 --- a/sysdeps/unix/sysv/linux/check_pf.c +++ b/sysdeps/unix/sysv/linux/check_pf.c @@ -35,9 +35,6 @@ #include <kernel-features.h> -#ifndef IFA_F_TEMPORARY -# define IFA_F_TEMPORARY IFA_F_SECONDARY -#endif #ifndef IFA_F_HOMEADDRESS # define IFA_F_HOMEADDRESS 0 #endif @@ -190,12 +187,10 @@ make_request (int fd, pid_t pid, bool *seen_ipv4, bool *seen_ipv6, | IFA_F_OPTIMISTIC)) ? in6ai_deprecated : 0) | ((ifam->ifa_flags - & IFA_F_TEMPORARY) - ? in6ai_temporary : 0) - | ((ifam->ifa_flags & IFA_F_HOMEADDRESS) ? in6ai_homeaddress : 0)); newp->info.prefixlen = ifam->ifa_prefixlen; + newp->info.index = ifam->ifa_index; if (ifam->ifa_family == AF_INET) { newp->info.addr[0] = 0; |