r2976 - in glibc-package/trunk/debian: . patches/kfreebsd
Author: ps-guest
Date: 2008-06-25 08:57:13 +0000 (Wed, 25 Jun 2008)
New Revision: 2976
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
Log:
* kfreebsd/local-sysdeps.diff: update to revision 2201 (from glibc-bsd)
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2008-06-24 11:06:00 UTC (rev 2975)
+++ glibc-package/trunk/debian/changelog 2008-06-25 08:57:13 UTC (rev 2976)
@@ -7,7 +7,7 @@
[ Petr Salinger]
* debian/sysdeps/kfreebsd.mk: also use the bsm/ directory from kernel
headers.
- * kfreebsd/local-sysdeps.diff: update to revision 2195 (from glibc-bsd).
+ * kfreebsd/local-sysdeps.diff: update to revision 2201 (from glibc-bsd).
-- Aurelien Jarno <aurel32@debian.org> Tue, 24 Jun 2008 11:36:17 +0200
Modified: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2008-06-24 11:06:00 UTC (rev 2975)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2008-06-25 08:57:13 UTC (rev 2976)
@@ -12268,177 +12268,368 @@
+libc_hidden_def (if_freenameindex)
diff -x .svn -Nurd null/sysdeps/unix/bsd/bsd4.4/kfreebsd/ifaddrs.c ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/ifaddrs.c
--- null/sysdeps/unix/bsd/bsd4.4/kfreebsd/ifaddrs.c 1970-01-01 01:00:00.000000000 +0100
-+++ ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/ifaddrs.c 2008-06-23 08:17:21.000000000 +0200
-@@ -0,0 +1,171 @@
-+/* 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.
++++ ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/ifaddrs.c 2008-06-25 12:52:49.000000000 +0200
+@@ -0,0 +1,362 @@
++/* $KAME: getifaddrs.c,v 1.9 2001/08/20 02:31:20 itojun Exp $ */
+
-+ 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.
++/*
++ * Copyright (c) 1995, 1999
++ * Berkeley Software Design, Inc. All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ *
++ * THIS SOFTWARE IS PROVIDED BY Berkeley Software Design, Inc. ``AS IS'' AND
++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED. IN NO EVENT SHALL Berkeley Software Design, Inc. BE LIABLE
++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++ * SUCH DAMAGE.
++ *
++ * BSDI getifaddrs.c,v 2.12 2000/02/23 14:51:59 dab Exp
++ */
+
-+ 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.
++#include <sys/cdefs.h>
+
-+ 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. */
++ /*
++__FBSDID("$FreeBSD: src/lib/libc/net/getifaddrs.c,v 1.6 2002/07/25 08:08:30 ume Exp $");
++ */
+
++#include <sys/types.h>
++#include <sys/ioctl.h>
++#include <sys/socket.h>
++#include <sys/sysctl.h>
++#include <net/if.h>
++
++#ifdef NET_RT_IFLIST
++#include <sys/param.h>
++#include <net/route.h>
++#include <sys/sysctl.h>
++#include <net/if_dl.h>
++#else
++#error NET_RT_IFLIST is required
++#endif
++
++#include <errno.h>
+#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>
++#if !defined(AF_LINK)
++#define SA_LEN(sa) sizeof(struct sockaddr)
++#endif
+
-+/* 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'. */
++#if !defined(SA_LEN)
++#define SA_LEN(sa) (sa)->sa_len
++#endif
++
++#define SALIGN (sizeof(long) - 1)
++#define SA_RLEN(sa) ((sa)->sa_len ? (((sa)->sa_len + SALIGN) & ~SALIGN) : (SALIGN + 1))
++
++#ifndef ALIGNBYTES
++/*
++ * On systems with a routing socket, ALIGNBYTES should match the value
++ * that the kernel uses when building the messages.
++ */
++#define ALIGNBYTES XXX
++#endif
++#ifndef ALIGN
++#define ALIGN(p) (((u_long)(p) + ALIGNBYTES) &~ ALIGNBYTES)
++#endif
++
++#define HAVE_IFM_DATA
++#define MAX_SYSCTL_TRY 5
++
+int
-+getifaddrs (struct ifaddrs **ifap)
++getifaddrs(struct ifaddrs **pif)
+{
-+ /* 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;
++ int icnt = 1;
++ int dcnt = 0;
++ int ncnt = 0;
++#ifdef NET_RT_IFLIST
++ int ntry = 0;
++ int mib[6];
++ size_t needed;
++ char *buf;
++ char *next;
++ struct ifaddrs *cif = 0;
++ char *p, *p0;
++ struct rt_msghdr *rtm;
++ struct if_msghdr *ifm;
++ struct ifa_msghdr *ifam;
++ struct sockaddr_dl *dl;
++ struct sockaddr *sa;
++ struct ifaddrs *ifa, *ift;
++ u_short idx = 0;
++#else /* NET_RT_IFLIST */
++#endif /* NET_RT_IFLIST */
++ int i;
++ size_t len, alen;
++ char *data;
++ char *names;
+
-+ if (fd < 0)
-+ return -1;
++#ifdef NET_RT_IFLIST
++ mib[0] = CTL_NET;
++ mib[1] = PF_ROUTE;
++ mib[2] = 0; /* protocol */
++ mib[3] = 0; /* wildcard address family */
++ mib[4] = NET_RT_IFLIST;
++ mib[5] = 0; /* no flags */
++ do {
++ /*
++ * We'll try to get addresses several times in case that
++ * the number of addresses is unexpectedly increased during
++ * the two sysctl calls. This should rarely happen, but we'll
++ * try to do our best for applications that assume success of
++ * this library (which should usually be the case).
++ * Portability note: since FreeBSD does not add margin of
++ * memory at the first sysctl, the possibility of failure on
++ * the second sysctl call is a bit higher.
++ */
+
-+ __ifreq (&ifreqs, &nifs, fd);
-+ if (ifreqs == NULL) /* XXX doesn't distinguish error vs none */
-+ {
-+ __close (fd);
-+ return -1;
-+ }
++ if (__sysctl(mib, 6, NULL, &needed, NULL, 0) < 0)
++ return (-1);
++ if ((buf = malloc(needed)) == NULL)
++ return (-1);
++ if (__sysctl(mib, 6, buf, &needed, NULL, 0) < 0) {
++ if (errno != ENOMEM || ++ntry >= MAX_SYSCTL_TRY) {
++ free(buf);
++ return (-1);
++ }
++ free(buf);
++ buf = NULL;
++ }
++ } while (buf == NULL);
+
-+ /* 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;
-+ struct ifreq *ifr;
-+ int i, j;
++ for (next = buf; next < buf + needed; next += rtm->rtm_msglen) {
++ rtm = (struct rt_msghdr *)(void *)next;
++ if (rtm->rtm_version != RTM_VERSION)
++ continue;
++ switch (rtm->rtm_type) {
++ case RTM_IFINFO:
++ ifm = (struct if_msghdr *)(void *)rtm;
++ if (ifm->ifm_addrs & RTA_IFP) {
++ idx = ifm->ifm_index;
++ ++icnt;
++ dl = (struct sockaddr_dl *)(void *)(ifm + 1);
++ dcnt += SA_RLEN((struct sockaddr *)(void*)dl) +
++ ALIGNBYTES;
++#ifdef HAVE_IFM_DATA
++ dcnt += sizeof(ifm->ifm_data);
++#endif /* HAVE_IFM_DATA */
++ ncnt += dl->sdl_nlen + 1;
++ } else
++ idx = 0;
++ break;
+
-+ storage = malloc (nifs * sizeof storage[0]);
-+ if (storage == NULL)
-+ {
-+ __close (fd);
-+ __if_freereq (ifreqs, nifs);
-+ return -1;
++ case RTM_NEWADDR:
++ ifam = (struct ifa_msghdr *)(void *)rtm;
++ if (idx && ifam->ifam_index != idx)
++ {
++ errno = EINVAL; /* this cannot happen */
++ return -1;
++ };
++#define RTA_MASKS (RTA_NETMASK | RTA_IFA | RTA_BRD)
++ if (idx == 0 || (ifam->ifam_addrs & RTA_MASKS) == 0)
++ break;
++ p = (char *)(void *)(ifam + 1);
++ ++icnt;
++#ifdef HAVE_IFAM_DATA
++ dcnt += sizeof(ifam->ifam_data) + ALIGNBYTES;
++#endif /* HAVE_IFAM_DATA */
++ /* Scan to look for length of address */
++ alen = 0;
++ for (p0 = p, i = 0; i < RTAX_MAX; i++) {
++ if ((RTA_MASKS & ifam->ifam_addrs & (1 << i))
++ == 0)
++ continue;
++ sa = (struct sockaddr *)(void *)p;
++ len = SA_RLEN(sa);
++ if (i == RTAX_IFA) {
++ alen = len;
++ break;
++ }
++ p += len;
++ }
++ for (p = p0, i = 0; i < RTAX_MAX; i++) {
++ if ((RTA_MASKS & ifam->ifam_addrs & (1 << i))
++ == 0)
++ continue;
++ sa = (struct sockaddr *)(void *)p;
++ len = SA_RLEN(sa);
++ if (i == RTAX_NETMASK && SA_LEN(sa) == 0)
++ dcnt += alen;
++ else
++ dcnt += len;
++ p += len;
++ }
++ break;
++ }
+ }
++#else /* NET_RT_IFLIST */
++#endif /* NET_RT_IFLIST */
+
-+ i = 0;
-+ j = 0;
-+ ifr = ifreqs;
-+ do
-+ {
-+ struct ifreq *next_ifr = __if_nextreq (ifr);
++ if (icnt + dcnt + ncnt == 1) {
++ *pif = NULL;
++ free(buf);
++ return (0);
++ }
++ data = malloc(sizeof(struct ifaddrs) * icnt + dcnt + ncnt);
++ if (data == NULL) {
++ free(buf);
++ return(-1);
++ }
+
-+ /* 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 */
++ ifa = (struct ifaddrs *)(void *)data;
++ data += sizeof(struct ifaddrs) * icnt;
++ names = data + dcnt;
+
-+ /* 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;
++ memset(ifa, 0, sizeof(struct ifaddrs) * icnt);
++ ift = ifa;
+
-+ /* The SIOCGIFCONF call filled in only the name and address.
-+ Now we must also ask for the other information we need. */
++#ifdef NET_RT_IFLIST
++ idx = 0;
++ for (next = buf; next < buf + needed; next += rtm->rtm_msglen) {
++ rtm = (struct rt_msghdr *)(void *)next;
++ if (rtm->rtm_version != RTM_VERSION)
++ continue;
++ switch (rtm->rtm_type) {
++ case RTM_IFINFO:
++ ifm = (struct if_msghdr *)(void *)rtm;
++ if (ifm->ifm_addrs & RTA_IFP) {
++ idx = ifm->ifm_index;
++ dl = (struct sockaddr_dl *)(void *)(ifm + 1);
+
-+ if (__ioctl (fd, SIOCGIFFLAGS, ifr) < 0)
-+ break;
++ cif = ift;
++ ift->ifa_name = names;
++ ift->ifa_flags = (int)ifm->ifm_flags;
++ memcpy(names, dl->sdl_data,
++ (size_t)dl->sdl_nlen);
++ names[dl->sdl_nlen] = 0;
++ names += dl->sdl_nlen + 1;
+
-+ /* Ignore interfaces that are down. */
-+ if (ifr->ifr_flags & IFF_UP)
-+ {
-+ storage[i].ia.ifa_flags = ifr->ifr_flags;
++ ift->ifa_addr = (struct sockaddr *)(void *)data;
++ memcpy(data, dl,
++ (size_t)SA_LEN((struct sockaddr *)
++ (void *)dl));
++ data += SA_RLEN((struct sockaddr *)(void *)dl);
+
-+ /* Retrieve the value for storage[i].ia.ifa_netmask. */
-+ ifr->ifr_addr = storage[i].addr;
-+ if (__ioctl (fd, SIOCGIFNETMASK, ifr) < 0)
-+ break;
-+ storage[i].netmask = ifr->ifr_netmask;
++#ifdef HAVE_IFM_DATA
++ /* ifm_data needs to be aligned */
++ ift->ifa_data = data = (void *)ALIGN(data);
++ memcpy(data, &ifm->ifm_data, sizeof(ifm->ifm_data));
++ data += sizeof(ifm->ifm_data);
++#else /* HAVE_IFM_DATA */
++ ift->ifa_data = NULL;
++#endif /* HAVE_IFM_DATA */
+
-+ /* Retrieve the value for storage[i].ia.ifa_broadaddr. */
-+ 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);
++ ift = (ift->ifa_next = ift + 1);
++ } else
++ idx = 0;
++ break;
+
-+ storage[i].ia.ifa_data = NULL; /* Nothing here for now. */
++ case RTM_NEWADDR:
++ ifam = (struct ifa_msghdr *)(void *)rtm;
++ if (idx && ifam->ifam_index != idx)
++ {
++ errno = EINVAL; /* this cannot happen */
++ return -1;
++ };
++ if (idx == 0 || (ifam->ifam_addrs & RTA_MASKS) == 0)
++ break;
++ ift->ifa_name = cif->ifa_name;
++ ift->ifa_flags = cif->ifa_flags;
++ ift->ifa_data = NULL;
++ p = (char *)(void *)(ifam + 1);
++ /* Scan to look for length of address */
++ alen = 0;
++ for (p0 = p, i = 0; i < RTAX_MAX; i++) {
++ if ((RTA_MASKS & ifam->ifam_addrs & (1 << i))
++ == 0)
++ continue;
++ sa = (struct sockaddr *)(void *)p;
++ len = SA_RLEN(sa);
++ if (i == RTAX_IFA) {
++ alen = len;
++ break;
++ }
++ p += len;
++ }
++ for (p = p0, i = 0; i < RTAX_MAX; i++) {
++ if ((RTA_MASKS & ifam->ifam_addrs & (1 << i))
++ == 0)
++ continue;
++ sa = (struct sockaddr *)(void *)p;
++ len = SA_RLEN(sa);
++ switch (i) {
++ case RTAX_IFA:
++ ift->ifa_addr =
++ (struct sockaddr *)(void *)data;
++ memcpy(data, p, len);
++ data += len;
++ break;
+
-+ ++i;
-+ }
++ case RTAX_NETMASK:
++ ift->ifa_netmask =
++ (struct sockaddr *)(void *)data;
++ if (SA_LEN(sa) == 0) {
++ memset(data, 0, alen);
++ data += alen;
++ break;
++ }
++ memcpy(data, p, len);
++ data += len;
++ break;
+
-+ ++j;
-+ ifr = next_ifr;
-+ } while (j < nifs);
-+ if (j < nifs) /* Broke out early on error. */
-+ {
-+ __close (fd);
-+ free (storage);
-+ __if_freereq (ifreqs, nifs);
-+ return -1;
++ case RTAX_BRD:
++ ift->ifa_broadaddr =
++ (struct sockaddr *)(void *)data;
++ memcpy(data, p, len);
++ data += len;
++ break;
++ }
++ p += len;
++ }
++
++#ifdef HAVE_IFAM_DATA
++ /* ifam_data needs to be aligned */
++ ift->ifa_data = data = (void *)ALIGN(data);
++ memcpy(data, &ifam->ifam_data, sizeof(ifam->ifam_data));
++ data += sizeof(ifam->ifam_data);
++#endif /* HAVE_IFAM_DATA */
++
++ ift = (ift->ifa_next = ift + 1);
++ break;
++ }
+ }
+
-+ if (i == 0)
-+ *ifap = NULL;
-+ else
-+ {
-+ storage[i - 1].ia.ifa_next = NULL;
-+ *ifap = &storage[0].ia;
++ free(buf);
++#else /* NET_RT_IFLIST */
++#endif /* NET_RT_IFLIST */
++ if (--ift >= ifa) {
++ ift->ifa_next = NULL;
++ *pif = ifa;
++ } else {
++ *pif = NULL;
++ free(ifa);
+ }
-+
-+ __close (fd);
-+ __if_freereq (ifreqs, nifs);
-+ }
-+
-+ return 0;
++ return (0);
+}
-+#ifndef getifaddrs
+libc_hidden_def (getifaddrs)
-+#endif
+
+void
-+freeifaddrs (struct ifaddrs *ifa)
++freeifaddrs(struct ifaddrs *ifp)
+{
-+ free (ifa);
++
++ free(ifp);
+}
+libc_hidden_def (freeifaddrs)
diff -x .svn -Nurd null/sysdeps/unix/bsd/bsd4.4/kfreebsd/ifreq.c ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/ifreq.c
Reply to: