aboutsummaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-07-24 22:56:44 +0000
committerRoland McGrath <roland@gnu.org>2002-07-24 22:56:44 +0000
commit7f1deee65e0a90d9e6699068b5d63a28d2546e12 (patch)
treeb75aefbdd5d6d8347e0d4d3f665d8e49fcf6c43b /sysdeps
parent11d657d7278ae4f96f0f4c8655991f2818d0eeb9 (diff)
downloadglibc-7f1deee65e0a90d9e6699068b5d63a28d2546e12.zip
glibc-7f1deee65e0a90d9e6699068b5d63a28d2546e12.tar.gz
glibc-7f1deee65e0a90d9e6699068b5d63a28d2546e12.tar.bz2
Added <ifaddrs.h> interface with functions `getifaddrs', `freeifaddrs'.
This implementation supports only IPv4. * inet/ifaddrs.h: New file. * sysdeps/generic/ifaddrs.c: New file. * sysdeps/gnu/ifaddrs.c: New file. * inet/test-ifaddrs.c: New file. * inet/Makefile (routines): Add ifaddrs. (headers): Add ifaddrs.h here. (tests): Add test-ifaddrs. * inet/Versions (GLIBC_2.3): New set, add getifaddrs and freeifaddrs. * resolv/res_hconf.c (_res_hconf_reorder_addrs): Use an explicit socket call to get an AF_INET socket, instead of using __opensock. The SIOCGIFNETMASK ioctl will work only with a PF_INET socket. * sysdeps/generic/ifreq.h (__ifreq): Take third argument SOCKFD, if not -1 use it instead of calling __opensock. * sysdeps/unix/sysv/linux/ifreq.h (__ifreq): Likewise. * sysdeps/mach/hurd/ifreq.h (__ifreq): Take new argument and ignore it. * resolv/res_hconf.c (_res_hconf_reorder_addrs): Pass new argument. * sysdeps/mach/hurd/ifreq.h: New file. * sysdeps/generic/ifreq.h (__if_freereq): Take second argument NUM_IFS. * sysdeps/unix/sysv/linux/ifreq.h (__if_freereq): Likewise. * resolv/res_hconf.c (_res_hconf_reorder_addrs): Update caller.
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/generic/ifaddrs.c44
-rw-r--r--sysdeps/generic/ifreq.h18
-rw-r--r--sysdeps/gnu/ifaddrs.c147
-rw-r--r--sysdeps/mach/hurd/ifreq.h74
-rw-r--r--sysdeps/unix/sysv/linux/ifreq.h21
5 files changed, 289 insertions, 15 deletions
diff --git a/sysdeps/generic/ifaddrs.c b/sysdeps/generic/ifaddrs.c
new file mode 100644
index 0000000..7b29aa1
--- /dev/null
+++ b/sysdeps/generic/ifaddrs.c
@@ -0,0 +1,44 @@
+/* getifaddrs -- get names and addresses of all network interfaces
+ Copyright (C) 2002 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, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <ifaddrs.h>
+#include <errno.h>
+#include <stdlib.h>
+
+/* Create a linked list of `struct ifaddrs' structures, one for each
+ network interface on the host machine. If successful, store the
+ list in *IFAP and return 0. On errors, return -1 and set `errno'. */
+int
+getifaddrs (struct ifaddrs **ifap)
+{
+ __set_errno (ENOSYS);
+ return -1;
+}
+stub_warning (getifaddrs)
+
+void
+freeifaddrs (struct ifaddrs *ifa)
+{
+ if (ifa == NULL)
+ return; /* a la free, why not? */
+
+ /* Can't be called properly if getifaddrs never succeeded. */
+ abort ();
+}
+stub_warning (freeifaddrs)
diff --git a/sysdeps/generic/ifreq.h b/sysdeps/generic/ifreq.h
index 62f3dcf..c96d1c8 100644
--- a/sysdeps/generic/ifreq.h
+++ b/sysdeps/generic/ifreq.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1999,2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Andreas Jaeger <aj@suse.de>.
@@ -26,15 +26,17 @@
static inline void
-__ifreq (struct ifreq **ifreqs, int *num_ifs)
+__ifreq (struct ifreq **ifreqs, int *num_ifs, int sockfd)
{
- int fd = __opensock ();
+ int fd = sockfd;
struct ifconf ifc;
int rq_len;
int nifs;
# define RQ_IFS 4
if (fd < 0)
+ fd = __opensock ();
+ if (fd < 0)
{
*num_ifs = 0;
*ifreqs = NULL;
@@ -51,8 +53,9 @@ __ifreq (struct ifreq **ifreqs, int *num_ifs)
{
if (ifc.ifc_buf)
free (ifc.ifc_buf);
-
- __close (fd);
+
+ if (fd != sockfd)
+ __close (fd);
*num_ifs = 0;
*ifreqs = NULL;
return;
@@ -63,7 +66,8 @@ __ifreq (struct ifreq **ifreqs, int *num_ifs)
nifs = ifc.ifc_len / sizeof (struct ifreq);
- __close (fd);
+ if (fd != sockfd)
+ __close (fd);
*num_ifs = nifs;
*ifreqs = realloc (ifc.ifc_buf, nifs * sizeof (struct ifreq));
@@ -71,7 +75,7 @@ __ifreq (struct ifreq **ifreqs, int *num_ifs)
static inline void
-__if_freereq (struct ifreq *ifreqs)
+__if_freereq (struct ifreq *ifreqs, int num_ifs)
{
free (ifreqs);
}
diff --git a/sysdeps/gnu/ifaddrs.c b/sysdeps/gnu/ifaddrs.c
new file mode 100644
index 0000000..e0a5b42
--- /dev/null
+++ b/sysdeps/gnu/ifaddrs.c
@@ -0,0 +1,147 @@
+/* getifaddrs -- get names and addresses of all network interfaces
+ Copyright (C) 2002 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, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <ifaddrs.h>
+#include <net/if.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <netinet/in.h>
+
+#include "ifreq.h"
+
+/* Create a linked list of `struct ifaddrs' structures, one for each
+ network interface on the host machine. If successful, store the
+ list in *IFAP and return 0. On errors, return -1 and set `errno'. */
+int
+getifaddrs (struct ifaddrs **ifap)
+{
+ /* This implementation handles only IPv4 interfaces.
+ The various ioctls below will only work on an AF_INET socket.
+ Some different mechanism entirely must be used for IPv6. */
+ int fd = __socket (AF_INET, SOCK_DGRAM, 0);
+ struct ifreq *ifreqs;
+ int nifs, i;
+
+ if (fd < 0)
+ return -1;
+
+ __ifreq (&ifreqs, &nifs, fd);
+ if (ifreqs == NULL) /* XXX doesn't distinguish error vs none */
+ {
+ __close (fd);
+ return -1;
+ }
+
+ /* Now we have the list of interfaces and each one's address.
+ Put it into the expected format and fill in the remaining details. */
+ if (nifs == 0)
+ *ifap = NULL;
+ else
+ {
+ struct
+ {
+ struct ifaddrs ia;
+ struct sockaddr addr, netmask, broadaddr;
+ char name[IF_NAMESIZE];
+ } *storage;
+
+ storage = malloc (nifs * sizeof storage[0]);
+ if (storage == NULL)
+ {
+ __close (fd);
+ __if_freereq (ifreqs, nifs);
+ return -1;
+ }
+
+ i = 0;
+ do
+ {
+ struct ifreq *const ifr = &ifreqs[i];
+
+ /* Fill in all pointers to the storage we've already allocated. */
+ storage[i].ia.ifa_next = &storage[i + 1].ia;
+ storage[i].ia.ifa_addr = &storage[i].addr;
+ storage[i].ia.ifa_netmask = &storage[i].netmask;
+ storage[i].ia.ifa_broadaddr = &storage[i].broadaddr; /* & dstaddr */
+
+ /* Now copy the information we already have from SIOCGIFCONF. */
+ storage[i].ia.ifa_name = strncpy (storage[i].name, ifr->ifr_name,
+ sizeof storage[i].name);
+ storage[i].addr = ifr->ifr_addr;
+
+ /* The SIOCGIFCONF call filled in only the name and address.
+ Now we must also ask for the other information we need. */
+
+ if (__ioctl (fd, SIOCGIFFLAGS, ifr) < 0)
+ break;
+ storage[i].ia.ifa_flags = ifr->ifr_flags;
+
+ ifr->ifr_addr = storage[i].addr;
+ if (__ioctl (fd, SIOCGIFNETMASK, ifr) < 0)
+ break;
+ storage[i].netmask = ifr->ifr_netmask;
+
+ if (ifr->ifr_flags & IFF_BROADCAST)
+ {
+ ifr->ifr_addr = storage[i].addr;
+ if (__ioctl (fd, SIOCGIFBRDADDR, ifr) < 0)
+ break;
+ storage[i].broadaddr = ifr->ifr_broadaddr;
+ }
+ else if (ifr->ifr_flags & IFF_POINTOPOINT)
+ {
+ ifr->ifr_addr = storage[i].addr;
+ if (__ioctl (fd, SIOCGIFDSTADDR, ifr) < 0)
+ break;
+ storage[i].broadaddr = ifr->ifr_dstaddr;
+ }
+ else
+ /* Just 'cause. */
+ memset (&storage[i].broadaddr, 0, sizeof storage[i].broadaddr);
+
+ storage[i].ia.ifa_data = NULL; /* Nothing here for now. */
+
+ } while (++i < nifs);
+ if (i < nifs) /* Broke out early on error. */
+ {
+ __close (fd);
+ free (storage);
+ __if_freereq (ifreqs, nifs);
+ return -1;
+ }
+ storage[i - 1].ia.ifa_next = NULL;
+
+ *ifap = &storage[0].ia;
+
+ __close (fd);
+ __if_freereq (ifreqs, nifs);
+ }
+
+ return 0;
+}
+
+void
+freeifaddrs (struct ifaddrs *ifa)
+{
+ free (ifa);
+}
diff --git a/sysdeps/mach/hurd/ifreq.h b/sysdeps/mach/hurd/ifreq.h
new file mode 100644
index 0000000..737dee9
--- /dev/null
+++ b/sysdeps/mach/hurd/ifreq.h
@@ -0,0 +1,74 @@
+/* Fetch the host's network interface list. Hurd version.
+ Copyright (C) 2002 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, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <net/if.h>
+#include <hurd.h>
+#include <hurd/pfinet.h>
+#include <sys/socket.h>
+#include <sys/mman.h>
+
+
+static inline void
+__ifreq (struct ifreq **ifreqs, int *num_ifs, int sockfd)
+{
+ struct ifconf ifc;
+ file_t server;
+
+ server = _hurd_socket_server (PF_INET, 0);
+ if (server == MACH_PORT_NULL)
+ {
+ out:
+ *num_ifs = 0;
+ *ifreqs = NULL;
+ }
+ else
+ {
+ char *data = NULL;
+ size_t len = 0;
+ error_t err = __pfinet_siocgifconf (server, -1, &data, &len);
+ if (err == MACH_SEND_INVALID_DEST || err == MIG_SERVER_DIED)
+ {
+ /* On the first use of the socket server during the operation,
+ allow for the old server port dying. */
+ server = _hurd_socket_server (PF_INET, 1);
+ if (server == MACH_PORT_NULL)
+ goto out;
+ err = __pfinet_siocgifconf (server, -1, ifreqs, &len);
+ }
+ if (err)
+ goto out;
+
+ if (len % sizeof (struct ifreq) != 0)
+ {
+ munmap (data, len);
+ errno = EGRATUITOUS;
+ goto out;
+ }
+ *num_ifs = len / sizeof (struct ifreq);
+ *ifreqs = (struct ifreq *) data;
+ }
+
+}
+
+
+static inline void
+__if_freereq (struct ifreq *ifreqs, int num_ifs)
+{
+ munmap (ifreqs, num_ifs * sizeof (struct ifreq))
+}
diff --git a/sysdeps/unix/sysv/linux/ifreq.h b/sysdeps/unix/sysv/linux/ifreq.h
index b383425..216c1f3 100644
--- a/sysdeps/unix/sysv/linux/ifreq.h
+++ b/sysdeps/unix/sysv/linux/ifreq.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1999,2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Andreas Jaeger <aj@suse.de>.
@@ -34,21 +34,23 @@ static int old_siocgifconf;
static inline void
-__ifreq (struct ifreq **ifreqs, int *num_ifs)
+__ifreq (struct ifreq **ifreqs, int *num_ifs, int sockfd)
{
- int fd = __opensock ();
+ int fd = sockfd;
struct ifconf ifc;
int rq_len;
int nifs;
# define RQ_IFS 4
if (fd < 0)
+ fd = __opensock ();
+ if (fd < 0)
{
*num_ifs = 0;
*ifreqs = NULL;
return;
}
-
+
ifc.ifc_buf = NULL;
/* We may be able to get the needed buffer size directly, rather than
@@ -79,8 +81,9 @@ __ifreq (struct ifreq **ifreqs, int *num_ifs)
{
if (ifc.ifc_buf)
free (ifc.ifc_buf);
-
- __close (fd);
+
+ if (fd != sockfd)
+ __close (fd);
*num_ifs = 0;
*ifreqs = NULL;
@@ -91,14 +94,16 @@ __ifreq (struct ifreq **ifreqs, int *num_ifs)
while (ifc.ifc_len == rq_len && old_siocgifconf);
nifs = ifc.ifc_len / sizeof (struct ifreq);
- __close (fd);
+
+ if (fd != sockfd)
+ __close (fd);
*num_ifs = nifs;
*ifreqs = realloc (ifc.ifc_buf, nifs * sizeof (struct ifreq));
}
static inline void
-__if_freereq (struct ifreq *ifreqs)
+__if_freereq (struct ifreq *ifreqs, int num_ifs)
{
free (ifreqs);
}