mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-30 00:31:08 +00:00
ec999b8e5e
It was noted in <https://sourceware.org/ml/libc-alpha/2012-09/msg00305.html> that the bits/*.h naming scheme should only be used for installed headers. This patch renames bits/libc-lock.h to plain libc-lock.h and bits/libc-lockP.h to plain libc-lockP.h to follow that convention. Note that I don't know where libc-lockP.h comes from for Hurd (the Hurd libc-lock.h includes libc-lockP.h, but the only libc-lockP.h in the glibc source tree is for NPTL) - some unmerged patch? - but I updated the #include in the Hurd libc-lock.h anyway. Tested for x86_64 (testsuite, and that installed stripped shared libraries are unchanged by the patch). [BZ #14912] * bits/libc-lock.h: Move to ... * sysdeps/generic/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. * sysdeps/mach/hurd/bits/libc-lock.h: Move to ... * sysdeps/mach/hurd/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. [_LIBC]: Include <libc-lockP.h> instead of <bits/libc-lockP.h>. * sysdeps/mach/bits/libc-lock.h: Move to ... * sysdeps/mach/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. * sysdeps/nptl/bits/libc-lock.h: Move to ... * sysdeps/nptl/libc-lock.h: ...here. (_BITS_LIBC_LOCK_H): Rename macro to _LIBC_LOCK_H. * sysdeps/nptl/bits/libc-lockP.h: Move to ... * sysdeps/nptl/libc-lockP.h: ...here. (_BITS_LIBC_LOCKP_H): Rename macro to _LIBC_LOCKP_H. * crypt/crypt_util.c: Include <libc-lock.h> instead of <bits/libc-lock.h>. * dirent/scandir-tail.c: Likewise. * dlfcn/dlerror.c: Likewise. * elf/dl-close.c: Likewise. * elf/dl-iteratephdr.c: Likewise. * elf/dl-lookup.c: Likewise. * elf/dl-open.c: Likewise. * elf/dl-support.c: Likewise. * elf/dl-writev.h: Likewise. * elf/rtld.c: Likewise. * grp/fgetgrent.c: Likewise. * gshadow/fgetsgent.c: Likewise. * gshadow/sgetsgent.c: Likewise. * iconv/gconv_conf.c: Likewise. * iconv/gconv_db.c: Likewise. * iconv/gconv_dl.c: Likewise. * iconv/gconv_int.h: Likewise. * iconv/gconv_trans.c: Likewise. * include/link.h: Likewise. * inet/getnameinfo.c: Likewise. * inet/getnetgrent.c: Likewise. * inet/getnetgrent_r.c: Likewise. * intl/bindtextdom.c: Likewise. * intl/dcigettext.c: Likewise. * intl/finddomain.c: Likewise. * intl/gettextP.h: Likewise. * intl/loadmsgcat.c: Likewise. * intl/localealias.c: Likewise. * intl/textdomain.c: Likewise. * libidn/idn-stub.c: Likewise. * libio/libioP.h: Likewise. * locale/duplocale.c: Likewise. * locale/freelocale.c: Likewise. * locale/newlocale.c: Likewise. * locale/setlocale.c: Likewise. * login/getutent_r.c: Likewise. * login/getutid_r.c: Likewise. * login/getutline_r.c: Likewise. * login/utmp-private.h: Likewise. * login/utmpname.c: Likewise. * malloc/mtrace.c: Likewise. * misc/efgcvt.c: Likewise. * misc/error.c: Likewise. * misc/fstab.c: Likewise. * misc/getpass.c: Likewise. * misc/mntent.c: Likewise. * misc/syslog.c: Likewise. * nis/nis_call.c: Likewise. * nis/nis_callback.c: Likewise. * nis/nss-default.c: Likewise. * nis/nss_compat/compat-grp.c: Likewise. * nis/nss_compat/compat-initgroups.c: Likewise. * nis/nss_compat/compat-pwd.c: Likewise. * nis/nss_compat/compat-spwd.c: Likewise. * nis/nss_nis/nis-alias.c: Likewise. * nis/nss_nis/nis-ethers.c: Likewise. * nis/nss_nis/nis-grp.c: Likewise. * nis/nss_nis/nis-hosts.c: Likewise. * nis/nss_nis/nis-network.c: Likewise. * nis/nss_nis/nis-proto.c: Likewise. * nis/nss_nis/nis-pwd.c: Likewise. * nis/nss_nis/nis-rpc.c: Likewise. * nis/nss_nis/nis-service.c: Likewise. * nis/nss_nis/nis-spwd.c: Likewise. * nis/nss_nisplus/nisplus-alias.c: Likewise. * nis/nss_nisplus/nisplus-ethers.c: Likewise. * nis/nss_nisplus/nisplus-grp.c: Likewise. * nis/nss_nisplus/nisplus-hosts.c: Likewise. * nis/nss_nisplus/nisplus-initgroups.c: Likewise. * nis/nss_nisplus/nisplus-network.c: Likewise. * nis/nss_nisplus/nisplus-proto.c: Likewise. * nis/nss_nisplus/nisplus-pwd.c: Likewise. * nis/nss_nisplus/nisplus-rpc.c: Likewise. * nis/nss_nisplus/nisplus-service.c: Likewise. * nis/nss_nisplus/nisplus-spwd.c: Likewise. * nis/ypclnt.c: Likewise. * nptl/libc_pthread_init.c: Likewise. * nss/getXXbyYY.c: Likewise. * nss/getXXent.c: Likewise. * nss/getXXent_r.c: Likewise. * nss/nss_db/db-XXX.c: Likewise. * nss/nss_db/db-netgrp.c: Likewise. * nss/nss_db/nss_db.h: Likewise. * nss/nss_files/files-XXX.c: Likewise. * nss/nss_files/files-alias.c: Likewise. * nss/nsswitch.c: Likewise. * posix/regex_internal.h: Likewise. * posix/wordexp.c: Likewise. * pwd/fgetpwent.c: Likewise. * resolv/res_hconf.c: Likewise. * resolv/res_libc.c: Likewise. * shadow/fgetspent.c: Likewise. * shadow/lckpwdf.c: Likewise. * shadow/sgetspent.c: Likewise. * socket/opensock.c: Likewise. * stdio-common/reg-modifier.c: Likewise. * stdio-common/reg-printf.c: Likewise. * stdio-common/reg-type.c: Likewise. * stdio-common/vfprintf.c: Likewise. * stdio-common/vfscanf.c: Likewise. * stdlib/abort.c: Likewise. * stdlib/cxa_atexit.c: Likewise. * stdlib/fmtmsg.c: Likewise. * stdlib/random.c: Likewise. * stdlib/setenv.c: Likewise. * string/strsignal.c: Likewise. * sunrpc/auth_none.c: Likewise. * sunrpc/bindrsvprt.c: Likewise. * sunrpc/create_xid.c: Likewise. * sunrpc/key_call.c: Likewise. * sunrpc/rpc_thread.c: Likewise. * sysdeps/arm/backtrace.c: Likewise. * sysdeps/generic/ldsodefs.h: Likewise. * sysdeps/generic/stdio-lock.h: Likewise. * sysdeps/generic/unwind-dw2-fde.c: Likewise. * sysdeps/i386/backtrace.c: Likewise. * sysdeps/ieee754/ldbl-opt/nldbl-compat.c: Likewise. * sysdeps/m68k/backtrace.c: Likewise. * sysdeps/mach/hurd/cthreads.c: Likewise. * sysdeps/mach/hurd/dirstream.h: Likewise. * sysdeps/mach/hurd/malloc-machine.h: Likewise. * sysdeps/nptl/malloc-machine.h: Likewise. * sysdeps/nptl/stdio-lock.h: Likewise. * sysdeps/posix/dirstream.h: Likewise. * sysdeps/posix/getaddrinfo.c: Likewise. * sysdeps/posix/system.c: Likewise. * sysdeps/pthread/aio_suspend.c: Likewise. * sysdeps/s390/s390-32/backtrace.c: Likewise. * sysdeps/s390/s390-64/backtrace.c: Likewise. * sysdeps/unix/sysv/linux/check_pf.c: Likewise. * sysdeps/unix/sysv/linux/if_index.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/getutent_r.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/getutid_r.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/getutline_r.c: Likewise. * sysdeps/unix/sysv/linux/shm-directory.c: Likewise. * sysdeps/unix/sysv/linux/system.c: Likewise. * sysdeps/x86_64/backtrace.c: Likewise. * time/alt_digit.c: Likewise. * time/era.c: Likewise. * time/tzset.c: Likewise. * wcsmbs/wcsmbsload.c: Likewise. * nptl/tst-initializers1.c (do_test): Refer to <libc-lock.h> instead of <bits/libc-lock.h> in comment.
242 lines
5.5 KiB
C
242 lines
5.5 KiB
C
/* Copyright (C) 1997-2015 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 <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)
|
|
weak_alias (__if_nametoindex, if_nametoindex)
|
|
libc_hidden_weak (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)
|
|
weak_alias (__if_freenameindex, if_freenameindex)
|
|
libc_hidden_weak (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
|
|
}
|
|
weak_alias (__if_nameindex, if_nameindex)
|
|
libc_hidden_weak (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);
|
|
}
|
|
weak_alias (__if_indextoname, if_indextoname)
|
|
libc_hidden_weak (if_indextoname)
|