mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-20 17:51:16 +00:00
11b076bbae
Now that files using __ASSUME_* macros have been made by <https://sourceware.org/ml/libc-alpha/2014-06/msg00543.html> to include <kernel-features.h> directly, any include from a file not using __ASSUME_* macros can safely be removed (as there will no longer be some other file relying on indirect inclusion via a header from which the include is being removed). This patch removes such unnecessary kernel-features.h includes. Tested x86_64 that disassembly of installed shared libraries is unchanged by this patch, except for line numbers in calls to __assert_fail from libc.so and ld.so. 2014-06-23 Joseph Myers <joseph@codesourcery.com> * nptl/createthread.c: Don't include kernel-features.h. * nptl/pthread_cancel.c: Likewise. * nptl/pthread_condattr_setclock.c: Likewise. * nptl/sysdeps/unix/sysv/linux/pt-raise.c: Likewise. * nptl/sysdeps/unix/sysv/linux/pthread_getcpuclockid.c: Likewise. * nptl/sysdeps/unix/sysv/linux/pthread_kill.c: Likewise. * nptl/sysdeps/unix/sysv/linux/pthread_sigqueue.c: Likewise. * nptl/sysdeps/unix/sysv/linux/raise.c: Likewise. * nptl/sysdeps/unix/sysv/linux/s390/s390-32/pt-vfork.S: Likewise. * nptl/sysdeps/unix/sysv/linux/s390/s390-32/vfork.S: Likewise. * nptl/sysdeps/unix/sysv/linux/s390/s390-64/pt-vfork.S: Likewise. * nptl/sysdeps/unix/sysv/linux/s390/s390-64/vfork.S: Likewise. * nptl/sysdeps/unix/sysv/linux/timer_create.c: Likewise. * nptl/sysdeps/unix/sysv/linux/timer_delete.c: Likewise. * nptl/sysdeps/unix/sysv/linux/timer_getoverr.c: Likewise. * nptl/sysdeps/unix/sysv/linux/timer_gettime.c: Likewise. * nptl/sysdeps/unix/sysv/linux/timer_routines.c: Likewise. * nptl/sysdeps/unix/sysv/linux/timer_settime.c: Likewise. * nscd/gai.c: Likewise. * nss/nss_db/db-open.c: Likewise. * sysdeps/generic/ldsodefs.h: Likewise. * sysdeps/sh/nptl/tls.h: Likewise. * sysdeps/unix/sysv/linux/aarch64/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/aarch64/sigcontextinfo.h: Likewise. * sysdeps/unix/sysv/linux/aarch64/vfork.S: Likewise. * sysdeps/unix/sysv/linux/adjtime.c: Likewise. * sysdeps/unix/sysv/linux/alpha/xstatconv.h: Likewise. * sysdeps/unix/sysv/linux/arm/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/arm/sigcontextinfo.h: Likewise. * sysdeps/unix/sysv/linux/check_pf.c: Likewise. * sysdeps/unix/sysv/linux/clock_getcpuclockid.c: Likewise. * sysdeps/unix/sysv/linux/clock_getres.c: Likewise. * sysdeps/unix/sysv/linux/clock_gettime.c: Likewise. * sysdeps/unix/sysv/linux/clock_nanosleep.c: Likewise. * sysdeps/unix/sysv/linux/clock_settime.c: Likewise. * sysdeps/unix/sysv/linux/dl-execstack.c: Likewise. * sysdeps/unix/sysv/linux/dl-osinfo.h: Likewise. * sysdeps/unix/sysv/linux/dl-sysdep.c: Likewise. * sysdeps/unix/sysv/linux/generic/futimesat.c: Likewise. * sysdeps/unix/sysv/linux/generic/poll.c: Likewise. * sysdeps/unix/sysv/linux/generic/wordsize-32/fcntl.c: Likewise. * sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat.c: Likewise. * sysdeps/unix/sysv/linux/generic/wordsize-32/pread.c: Likewise. * sysdeps/unix/sysv/linux/generic/wordsize-32/pread64.c: Likewise. * sysdeps/unix/sysv/linux/generic/wordsize-32/preadv.c: Likewise. * sysdeps/unix/sysv/linux/generic/wordsize-32/preadv64.c: Likewise. * sysdeps/unix/sysv/linux/generic/wordsize-32/pwrite.c: Likewise. * sysdeps/unix/sysv/linux/generic/wordsize-32/pwrite64.c: Likewise. * sysdeps/unix/sysv/linux/generic/wordsize-32/pwritev.c: Likewise. * sysdeps/unix/sysv/linux/generic/wordsize-32/pwritev64.c: Likewise. * sysdeps/unix/sysv/linux/getcwd.c: Likewise. * sysdeps/unix/sysv/linux/getpagesize.c: Likewise. * sysdeps/unix/sysv/linux/getsysstats.c: Likewise. * sysdeps/unix/sysv/linux/i386/fxstat.c: Likewise. * sysdeps/unix/sysv/linux/i386/lxstat.c: Likewise. * sysdeps/unix/sysv/linux/i386/mmap.S: Likewise. * sysdeps/unix/sysv/linux/i386/mmap64.S: Likewise. * sysdeps/unix/sysv/linux/i386/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/i386/vfork.S: Likewise. * sysdeps/unix/sysv/linux/i386/xstat.c: Likewise. * sysdeps/unix/sysv/linux/ia64/system.c: Likewise. * sysdeps/unix/sysv/linux/if_index.c: Likewise. * sysdeps/unix/sysv/linux/ifaddrs.c: Likewise. * sysdeps/unix/sysv/linux/ifreq.c: Likewise. * sysdeps/unix/sysv/linux/ldsodefs.h: Likewise. * sysdeps/unix/sysv/linux/lutimes.c: Likewise. * sysdeps/unix/sysv/linux/m68k/vfork.S: Likewise. * sysdeps/unix/sysv/linux/microblaze/nptl/vfork.S: Likewise. * sysdeps/unix/sysv/linux/mips/mips32/accept4.c: Likewise. * sysdeps/unix/sysv/linux/mips/mips32/recvmmsg.c: Likewise. * sysdeps/unix/sysv/linux/mips/mips32/sendmmsg.c: Likewise. * sysdeps/unix/sysv/linux/mips/pread.c: Likewise. * sysdeps/unix/sysv/linux/mips/pread64.c: Likewise. * sysdeps/unix/sysv/linux/mips/pwrite.c: Likewise. * sysdeps/unix/sysv/linux/mips/pwrite64.c: Likewise. * sysdeps/unix/sysv/linux/mips/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/mmap64.c: Likewise. * sysdeps/unix/sysv/linux/netlinkaccess.h: Likewise. * sysdeps/unix/sysv/linux/powerpc/chown.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/clone.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/fe_mask.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/fe_nomask.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/getcontext.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/pread.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/pread64.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/pwrite.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/pwrite64.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/vfork.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/fpu/fe_mask.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/fpu/fe_nomask.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/getcontext.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/pread.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/pread64.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/pwrite.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/pwrite64.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/vfork.S: Likewise. * sysdeps/unix/sysv/linux/pread.c: Likewise. * sysdeps/unix/sysv/linux/pread64.c: Likewise. * sysdeps/unix/sysv/linux/prof-freq.c: Likewise. * sysdeps/unix/sysv/linux/pwrite.c: Likewise. * sysdeps/unix/sysv/linux/pwrite64.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/mmap.S: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/mmap64.S: Likewise. * sysdeps/unix/sysv/linux/s390/system.c: Likewise. * sysdeps/unix/sysv/linux/sh/pread.c: Likewise. * sysdeps/unix/sysv/linux/sh/pread64.c: Likewise. * sysdeps/unix/sysv/linux/sh/pwrite.c: Likewise. * sysdeps/unix/sysv/linux/sh/pwrite64.c: Likewise. * sysdeps/unix/sysv/linux/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/sigpending.c: Likewise. * sysdeps/unix/sysv/linux/sigprocmask.c: Likewise. * sysdeps/unix/sysv/linux/sigsuspend.c: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/xstatconv.c: Likewise. * sysdeps/unix/sysv/linux/sparc/system.c: Likewise. * sysdeps/unix/sysv/linux/syslog.c: Likewise. * sysdeps/unix/sysv/linux/system.c: Likewise. * sysdeps/unix/sysv/linux/testrtsig.h: Likewise. * sysdeps/unix/sysv/linux/timespec_get.c: Likewise. * sysdeps/unix/sysv/linux/ttyname.c: Likewise. * sysdeps/unix/sysv/linux/ttyname_r.c: Likewise. * sysdeps/unix/sysv/linux/utimensat.c: Likewise. * sysdeps/unix/sysv/linux/x86_64/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/xstatconv.h: Likewise.
236 lines
5.3 KiB
C
236 lines
5.3 KiB
C
/* Copyright (C) 1997-2014 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <alloca.h>
|
|
#include <errno.h>
|
|
#include <string.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
#include <net/if.h>
|
|
#include <sys/socket.h>
|
|
#include <sys/ioctl.h>
|
|
#include <bits/libc-lock.h>
|
|
#include <not-cancel.h>
|
|
|
|
#include "netlinkaccess.h"
|
|
|
|
|
|
unsigned int
|
|
if_nametoindex (const char *ifname)
|
|
{
|
|
#ifndef SIOCGIFINDEX
|
|
__set_errno (ENOSYS);
|
|
return 0;
|
|
#else
|
|
struct ifreq ifr;
|
|
int fd = __opensock ();
|
|
|
|
if (fd < 0)
|
|
return 0;
|
|
|
|
strncpy (ifr.ifr_name, ifname, sizeof (ifr.ifr_name));
|
|
if (__ioctl (fd, SIOCGIFINDEX, &ifr) < 0)
|
|
{
|
|
int saved_errno = errno;
|
|
close_not_cancel_no_status (fd);
|
|
if (saved_errno == EINVAL)
|
|
__set_errno (ENOSYS);
|
|
return 0;
|
|
}
|
|
close_not_cancel_no_status (fd);
|
|
return ifr.ifr_ifindex;
|
|
#endif
|
|
}
|
|
libc_hidden_def (if_nametoindex)
|
|
|
|
|
|
void
|
|
if_freenameindex (struct if_nameindex *ifn)
|
|
{
|
|
struct if_nameindex *ptr = ifn;
|
|
while (ptr->if_name || ptr->if_index)
|
|
{
|
|
free (ptr->if_name);
|
|
++ptr;
|
|
}
|
|
free (ifn);
|
|
}
|
|
libc_hidden_def (if_freenameindex)
|
|
|
|
|
|
static struct if_nameindex *
|
|
if_nameindex_netlink (void)
|
|
{
|
|
struct netlink_handle nh = { 0, 0, 0, NULL, NULL };
|
|
struct if_nameindex *idx = NULL;
|
|
|
|
if (__netlink_open (&nh) < 0)
|
|
return NULL;
|
|
|
|
|
|
/* Tell the kernel that we wish to get a list of all
|
|
active interfaces. Collect all data for every interface. */
|
|
if (__netlink_request (&nh, RTM_GETLINK) < 0)
|
|
goto exit_free;
|
|
|
|
/* Count the interfaces. */
|
|
unsigned int nifs = 0;
|
|
for (struct netlink_res *nlp = nh.nlm_list; nlp; nlp = nlp->next)
|
|
{
|
|
struct nlmsghdr *nlh;
|
|
size_t size = nlp->size;
|
|
|
|
if (nlp->nlh == NULL)
|
|
continue;
|
|
|
|
/* Walk through all entries we got from the kernel and look, which
|
|
message type they contain. */
|
|
for (nlh = nlp->nlh; NLMSG_OK (nlh, size); nlh = NLMSG_NEXT (nlh, size))
|
|
{
|
|
/* Check if the message is what we want. */
|
|
if ((pid_t) nlh->nlmsg_pid != nh.pid || nlh->nlmsg_seq != nlp->seq)
|
|
continue;
|
|
|
|
if (nlh->nlmsg_type == NLMSG_DONE)
|
|
break; /* ok */
|
|
|
|
if (nlh->nlmsg_type == RTM_NEWLINK)
|
|
++nifs;
|
|
}
|
|
}
|
|
|
|
idx = malloc ((nifs + 1) * sizeof (struct if_nameindex));
|
|
if (idx == NULL)
|
|
{
|
|
nomem:
|
|
__set_errno (ENOBUFS);
|
|
goto exit_free;
|
|
}
|
|
|
|
/* Add the interfaces. */
|
|
nifs = 0;
|
|
for (struct netlink_res *nlp = nh.nlm_list; nlp; nlp = nlp->next)
|
|
{
|
|
struct nlmsghdr *nlh;
|
|
size_t size = nlp->size;
|
|
|
|
if (nlp->nlh == NULL)
|
|
continue;
|
|
|
|
/* Walk through all entries we got from the kernel and look, which
|
|
message type they contain. */
|
|
for (nlh = nlp->nlh; NLMSG_OK (nlh, size); nlh = NLMSG_NEXT (nlh, size))
|
|
{
|
|
/* Check if the message is what we want. */
|
|
if ((pid_t) nlh->nlmsg_pid != nh.pid || nlh->nlmsg_seq != nlp->seq)
|
|
continue;
|
|
|
|
if (nlh->nlmsg_type == NLMSG_DONE)
|
|
break; /* ok */
|
|
|
|
if (nlh->nlmsg_type == RTM_NEWLINK)
|
|
{
|
|
struct ifinfomsg *ifim = (struct ifinfomsg *) NLMSG_DATA (nlh);
|
|
struct rtattr *rta = IFLA_RTA (ifim);
|
|
size_t rtasize = IFLA_PAYLOAD (nlh);
|
|
|
|
idx[nifs].if_index = ifim->ifi_index;
|
|
|
|
while (RTA_OK (rta, rtasize))
|
|
{
|
|
char *rta_data = RTA_DATA (rta);
|
|
size_t rta_payload = RTA_PAYLOAD (rta);
|
|
|
|
if (rta->rta_type == IFLA_IFNAME)
|
|
{
|
|
idx[nifs].if_name = __strndup (rta_data, rta_payload);
|
|
if (idx[nifs].if_name == NULL)
|
|
{
|
|
idx[nifs].if_index = 0;
|
|
if_freenameindex (idx);
|
|
idx = NULL;
|
|
goto nomem;
|
|
}
|
|
break;
|
|
}
|
|
|
|
rta = RTA_NEXT (rta, rtasize);
|
|
}
|
|
|
|
++nifs;
|
|
}
|
|
}
|
|
}
|
|
|
|
idx[nifs].if_index = 0;
|
|
idx[nifs].if_name = NULL;
|
|
|
|
exit_free:
|
|
__netlink_free_handle (&nh);
|
|
__netlink_close (&nh);
|
|
|
|
return idx;
|
|
}
|
|
|
|
|
|
struct if_nameindex *
|
|
if_nameindex (void)
|
|
{
|
|
#ifndef SIOCGIFINDEX
|
|
__set_errno (ENOSYS);
|
|
return NULL;
|
|
#else
|
|
struct if_nameindex *result = if_nameindex_netlink ();
|
|
return result;
|
|
#endif
|
|
}
|
|
libc_hidden_def (if_nameindex)
|
|
|
|
|
|
char *
|
|
if_indextoname (unsigned int ifindex, char *ifname)
|
|
{
|
|
/* We may be able to do the conversion directly, rather than searching a
|
|
list. This ioctl is not present in kernels before version 2.1.50. */
|
|
struct ifreq ifr;
|
|
int fd;
|
|
int status;
|
|
|
|
fd = __opensock ();
|
|
|
|
if (fd < 0)
|
|
return NULL;
|
|
|
|
ifr.ifr_ifindex = ifindex;
|
|
status = __ioctl (fd, SIOCGIFNAME, &ifr);
|
|
|
|
close_not_cancel_no_status (fd);
|
|
|
|
if (status < 0)
|
|
{
|
|
if (errno == ENODEV)
|
|
/* POSIX requires ENXIO. */
|
|
__set_errno (ENXIO);
|
|
|
|
return NULL;
|
|
}
|
|
else
|
|
return strncpy (ifname, ifr.ifr_name, IFNAMSIZ);
|
|
}
|
|
libc_hidden_def (if_indextoname)
|