diff options
| author | Roland McGrath <roland@gnu.org> | 2000-03-24 20:59:00 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2000-03-24 20:59:00 +0000 |
| commit | 4f173e2c8a9ee8d5cb64d56a4bad391168d78a2b (patch) | |
| tree | 72b8969fa036cc15ad3b3d4c9571ce63665fbfc9 /sysdeps/generic | |
| parent | acdacef901d20f6693ae8beb4169b9dbf0a46e81 (diff) | |
| download | glibc-4f173e2c8a9ee8d5cb64d56a4bad391168d78a2b.tar.gz glibc-4f173e2c8a9ee8d5cb64d56a4bad391168d78a2b.tar.xz glibc-4f173e2c8a9ee8d5cb64d56a4bad391168d78a2b.zip | |
* sysdeps/mach/hurd/if_index.c: New file.
* sysdeps/unix/sysv/linux/net/if.h: Moved to ... * sysdeps/gnu/net/if.h: here. (_IOT_ifconf, _IOT_ifreq): Hurd ioctl type macros moved from ... * sysdeps/mach/hurd/net/if.h: ... here; this file now removed. * sysdeps/generic/net/if.h: New file. Declares just the standard functions and `struct if_nameindex' type. * socket/Makefile (headers): Add net/if.h here. * sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Not here. * sysdeps/mach/hurd/Dist: Remove it here. * sysdeps/unix/sysv/linux/Dist: And here. * sysdeps/generic/if_index.c: Include <net/if.h>.
Diffstat (limited to 'sysdeps/generic')
| -rw-r--r-- | sysdeps/generic/if_index.c | 5 | ||||
| -rw-r--r-- | sysdeps/generic/net/if.h | 50 |
2 files changed, 52 insertions, 3 deletions
diff --git a/sysdeps/generic/if_index.c b/sysdeps/generic/if_index.c index e8af824e66..4dc2a5511a 100644 --- a/sysdeps/generic/if_index.c +++ b/sysdeps/generic/if_index.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1997,98,99,2000 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 @@ -16,8 +16,8 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include <net/if.h> #include <errno.h> -#define __need_NULL #include <stddef.h> unsigned int @@ -36,7 +36,6 @@ if_indextoname (unsigned int ifindex, char *ifname) } stub_warning (if_indextoname) -struct if_nameindex; /* inhibit warning */ void if_freenameindex (struct if_nameindex *ifn) { diff --git a/sysdeps/generic/net/if.h b/sysdeps/generic/net/if.h new file mode 100644 index 0000000000..fcfdbdb22a --- /dev/null +++ b/sysdeps/generic/net/if.h @@ -0,0 +1,50 @@ +/* net/if.h -- declarations for inquiring about network interfaces + Copyright (C) 2000 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 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. */ + +#ifndef _NET_IF_H + +#define _NET_IF_H 1 +#include <features.h> + + +__BEGIN_DECLS + +/* Convert an interface name to an index, and vice versa. */ + +extern unsigned int if_nametoindex (__const char *__ifname) __THROW; +extern char *if_indextoname (unsigned int __ifindex, char *__ifname) __THROW; + +/* Return a list of all interfaces and their indices. */ + +struct if_nameindex + { + unsigned int if_index; /* 1, 2, ... */ + char *if_name; /* null terminated name: "eth0", ... */ + }; + +extern struct if_nameindex *if_nameindex (void) __THROW; + +/* Free the data returned from if_nameindex. */ + +extern void if_freenameindex (struct if_nameindex *__ptr) __THROW; + +__END_DECLS + + +#endif /* net/if.h */ |