mirror of https://gitee.com/Nocallback/glibc.git
Browse Source
1999-10-27 Andreas Jaeger <aj@suse.de> * sysdeps/generic/ifreq.h: New file. * resolv/res_hconf.c: Add missing includes to get all prototypes. (_res_hconf_reorder_addrs): Rewrite. This never worked before. Reported by John DiMarco <jdd@cs.toronto.edu>. (_res_hconf_reorder_addrs): Made thread safe. (free_mem): New function, needed for malloc debugging. 1999-10-29 Andreas Jaeger <aj@suse.de> * sysdeps/unix/sysv/linux/if_index.c (opensock): Move function to ... * sysdeps/generic/opensock.c (__opensock): ...here in a new file. * sysdeps/unix/sysv/linux/if_index.c: Change all callers of opensock to use __opensock. * socket/Makefile (routines): Add opensock. * include/sys/socket.h (__opensock): Add prototype declaration.cvs/glibc-2-2-branch
Ulrich Drepper
27 years ago
7 changed files with 267 additions and 113 deletions
@ -0,0 +1,76 @@ |
|||
/* Copyright (C) 1999 Free Software Foundation, Inc.
|
|||
Contributed by Andreas Jaeger <aj@suse.de>. |
|||
|
|||
The GNU C Library is free software; you can redistribute it and/or |
|||
modify it under the terms of the GNU Library General Public License as |
|||
published by the Free Software Foundation; either version 2 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 |
|||
Library General Public License for more details. |
|||
|
|||
You should have received a copy of the GNU Library General Public |
|||
License along with the GNU C Library; see the file COPYING.LIB. If not, |
|||
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
|||
Boston, MA 02111-1307, USA. */ |
|||
|
|||
#include <stdio.h> |
|||
#include <stdlib.h> |
|||
#include <unistd.h> |
|||
#include <net/if.h> |
|||
#include <sys/socket.h> |
|||
#include <sys/ioctl.h> |
|||
|
|||
|
|||
static inline void |
|||
__ifreq (struct ifreq **ifreqs, int *num_ifs) |
|||
{ |
|||
int fd = __opensock (); |
|||
struct ifconf ifc; |
|||
int rq_len; |
|||
int nifs; |
|||
# define RQ_IFS 4 |
|||
|
|||
if (fd < 0) |
|||
{ |
|||
*num_ifs = 0; |
|||
*ifreqs = NULL; |
|||
return; |
|||
} |
|||
|
|||
ifc.ifc_buf = NULL; |
|||
rq_len = RQ_IFS * sizeof (struct ifreq); |
|||
do |
|||
{ |
|||
ifc.ifc_len = rq_len; |
|||
ifc.ifc_buf = realloc (ifc.ifc_buf, ifc.ifc_len); |
|||
if (ifc.ifc_buf == NULL || __ioctl (fd, SIOCGIFCONF, &ifc) < 0) |
|||
{ |
|||
if (ifc.ifc_buf) |
|||
free (ifc.ifc_buf); |
|||
|
|||
__close (fd); |
|||
*num_ifs = 0; |
|||
*ifreqs = NULL; |
|||
return; |
|||
} |
|||
rq_len *= 2; |
|||
} |
|||
while (rq_len < sizeof (struct ifreq) + ifc.ifc_len); |
|||
|
|||
nifs = ifc.ifc_len / sizeof (struct ifreq); |
|||
|
|||
__close (fd); |
|||
|
|||
*num_ifs = nifs; |
|||
*ifreqs = realloc (ifc.ifc_buf, nifs * sizeof (struct ifreq)); |
|||
} |
|||
|
|||
|
|||
static inline void |
|||
__if_freereq (struct ifreq *ifreqs) |
|||
{ |
|||
free (ifreqs); |
|||
} |
|||
@ -0,0 +1,70 @@ |
|||
/* Copyright (C) 1999 Free Software Foundation, Inc.
|
|||
|
|||
The GNU C Library is free software; you can redistribute it and/or |
|||
modify it under the terms of the GNU Library General Public License as |
|||
published by the Free Software Foundation; either version 2 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 |
|||
Library General Public License for more details. |
|||
|
|||
You should have received a copy of the GNU Library General Public |
|||
License along with the GNU C Library; see the file COPYING.LIB. If not, |
|||
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
|||
Boston, MA 02111-1307, USA. */ |
|||
|
|||
#include <stdio.h> |
|||
#include <sys/socket.h> |
|||
#include <bits/libc-lock.h> |
|||
|
|||
/* Return a socket of any type. The socket can be used in subsequent
|
|||
ioctl calls to talk to the kernel. */ |
|||
int internal_function |
|||
__opensock (void) |
|||
{ |
|||
/* Cache the last AF that worked, to avoid many redundant calls to
|
|||
socket(). */ |
|||
static int sock_af = -1; |
|||
int fd = -1; |
|||
__libc_lock_define_initialized (static, lock); |
|||
|
|||
if (sock_af != -1) |
|||
{ |
|||
fd = __socket (sock_af, SOCK_DGRAM, 0); |
|||
if (fd != -1) |
|||
return fd; |
|||
} |
|||
|
|||
__libc_lock_lock (lock); |
|||
|
|||
if (sock_af != -1) |
|||
fd = __socket (sock_af, SOCK_DGRAM, 0); |
|||
|
|||
if (fd == -1) |
|||
{ |
|||
#ifdef AF_INET |
|||
fd = __socket (sock_af = AF_INET, SOCK_DGRAM, 0); |
|||
#endif |
|||
#ifdef AF_INET6 |
|||
if (fd < 0) |
|||
fd = __socket (sock_af = AF_INET6, SOCK_DGRAM, 0); |
|||
#endif |
|||
#ifdef AF_IPX |
|||
if (fd < 0) |
|||
fd = __socket (sock_af = AF_IPX, SOCK_DGRAM, 0); |
|||
#endif |
|||
#ifdef AF_AX25 |
|||
if (fd < 0) |
|||
fd = __socket (sock_af = AF_AX25, SOCK_DGRAM, 0); |
|||
#endif |
|||
#ifdef AF_APPLETALK |
|||
if (fd < 0) |
|||
fd = __socket (sock_af = AF_APPLETALK, SOCK_DGRAM, 0); |
|||
#endif |
|||
} |
|||
|
|||
__libc_lock_unlock (lock); |
|||
return fd; |
|||
} |
|||
Loading…
Reference in new issue