OpenE2K/glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* sysdeps/mach/hurd/if_index.c: New file.

Browse Source 
* 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>.
This commit is contained in:
Roland McGrath 2000-03-24 20:59:00 +00:00
parent acdacef901
commit 4f173e2c8a
10 changed files with 241 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -1,3 +1,19 @@
2000-03-24 Roland McGrath <roland@baalperazim.frob.com>
* 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>.
2000-03-24 Andreas Jaeger <aj@suse.de>
* sysdeps/mips/dl-machine.h (__dl_runtime_resolve): Use D_PTR to

4
socket/Makefile
View File

@ -1,4 +1,4 @@
# Copyright (C) 1991, 95, 96, 97, 98, 99 Free Software Foundation, Inc.
# Copyright (C) 1991,95,96,97,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
@ -22,7 +22,7 @@
subdir := socket
headers := sys/socket.h sys/un.h bits/sockaddr.h bits/socket.h \
sys/socketvar.h
sys/socketvar.h net/if.h
routines := accept bind connect getpeername getsockname getsockopt \
listen recv recvfrom recvmsg send sendmsg sendto \

5
sysdeps/generic/if_index.c
View File

@ -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)
{

50
sysdeps/generic/net/if.h Normal file
View File

@ -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 */

6
sysdeps/unix/sysv/linux/net/if.h → sysdeps/gnu/net/if.h
View File

@ -1,4 +1,5 @@
/* Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
/* net/if.h -- declarations for inquiring about network interfaces
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
@ -131,7 +132,6 @@ struct ifreq
__caddr_t ifru_data;
} ifr_ifru;
};
#define ifr_name ifr_ifrn.ifrn_name /* interface name */
#define ifr_hwaddr ifr_ifru.ifru_hwaddr /* MAC address */
#define ifr_addr ifr_ifru.ifru_addr /* address */
@ -147,6 +147,7 @@ struct ifreq
#define ifr_ifindex ifr_ifru.ifru_ivalue /* interface index */
#define ifr_bandwidth ifr_ifru.ifru_ivalue /* link bandwidth */
#define ifr_qlen ifr_ifru.ifru_ivalue /* queue length */
#define _IOT_ifreq _IOT(_IOTS(struct ifreq),1,0,0,0,0) /* not right */
/* Structure used in SIOCGIFCONF request. Used to retrieve interface
@ -164,6 +165,7 @@ struct ifconf
};
#define ifc_buf ifc_ifcu.ifcu_buf /* Buffer address. */
#define ifc_req ifc_ifcu.ifcu_req /* Array of structures. */
#define _IOT_ifconf _IOT(_IOTS(struct ifconf),1,0,0,0,0) /* not right */
__BEGIN_DECLS

1
sysdeps/mach/hurd/Dist
View File

@ -7,7 +7,6 @@ libc-ldscript
libc_p-ldscript
bits/libc-tsd.h
net/ethernet.h
net/if.h
net/if_arp.h
net/if_ether.h
net/if_ppp.h

166
sysdeps/mach/hurd/if_index.c Normal file
View File

@ -0,0 +1,166 @@
/* Find network interface names and index numbers. Hurd version.
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. */
#include <net/if.h>
#include <hurd.h>
#include <hurd/fsys.h>
#include <string.h>
#include <sys/mman.h>
static int
map_interfaces (int domain,
unsigned int *idxp,
int (*counted_initializer) (unsigned int count,
size_t nameslen),
int (*iterator) (const char *))
{
static const char ifopt[] = "--interface=";
file_t server;
char optsbuf[512], *opts = optsbuf, *p;
size_t optslen = sizeof optsbuf;
error_t err;
/* Find the socket server for DOMAIN. */
server = _hurd_socket_server (domain, 0);
if (server == MACH_PORT_NULL)
return 0;
err = __file_get_fs_options (server, &opts, &optslen);
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 (domain, 1);
if (server == MACH_PORT_NULL)
return -1;
err = __file_get_fs_options (server, &opts, &optslen);
}
if (err)
return __hurd_fail (err), 0;
if (counted_initializer)
{
unsigned int count = 0;
size_t nameslen = 0;
p = memchr (opts, '\0', optslen);
while (p != 0)
{
char *end = memchr (p + 1, '\0', optslen - (p - opts));
if (end == 0)
break;
if (optslen - (p - opts) >= sizeof ifopt
&& !memcmp (p + 1, ifopt, sizeof ifopt - 1))
{
size_t len = end + 1 - (p + sizeof ifopt);
nameslen += len > IFNAMSIZ+1 ? IFNAMSIZ+1 : len;
++count;
}
p = end;
}
if ((*counted_initializer) (count, nameslen))
return 0;
}
*idxp = 0;
for (p = memchr (opts, '\0', optslen); p != 0;
p = memchr (p + 1, '\0', optslen - (p - opts)))
{
++*idxp;
if (optslen - (p - opts) >= sizeof ifopt
&& !memcmp (p + 1, ifopt, sizeof ifopt - 1)
&& (*iterator) (p + sizeof ifopt))
break;
}
if (opts != optsbuf)
__munmap (opts, optslen);
return 1;
}
unsigned int
if_nametoindex (const char *ifname)
{
unsigned int idx;
int find_name (const char *name)
{
return !strcmp (name, ifname);
}
return map_interfaces (PF_INET, &idx, 0, &find_name) ? idx : 0;
}
char *
if_indextoname (unsigned int ifindex, char *ifname)
{
unsigned int idx;
int find_idx (const char *name)
{
if (idx == ifindex)
{
strncpy (ifname, name, IFNAMSIZ);
return 1;
}
return 0;
}
return map_interfaces (PF_INET, &idx, 0, &find_idx) ? ifname : NULL;
}
struct if_nameindex *
if_nameindex (void)
{
unsigned int idx;
struct if_nameindex *buf;
char *namep;
int alloc (unsigned int count, size_t nameslen)
{
buf = malloc ((sizeof buf[0] * (count + 1)) + nameslen);
if (buf == 0)
return 1;
buf[count].if_index = 0;
buf[count].if_name = NULL;
namep = (char *) &buf[count + 1];
return 0;
}
int fill (const char *name)
{
buf[idx - 1].if_index = idx;
buf[idx - 1].if_name = namep;
namep = __memccpy (namep, name, '\0', IFNAMSIZ+1) ?: &namep[IFNAMSIZ+1];
return 0;
}
return map_interfaces (PF_INET, &idx, &alloc, &fill) ? buf : NULL;
}
void
if_freenameindex (struct if_nameindex *ifn)
{
free (ifn);
}
void
internal_function
__protocol_available (int *have_inet, int *have_inet6)
{
*have_inet = _hurd_socket_server (PF_INET, 0) != MACH_PORT_NULL;
*have_inet6 = _hurd_socket_server (PF_INET6, 0) != MACH_PORT_NULL;
}

169
sysdeps/mach/hurd/net/if.h
View File

@ -1,169 +0,0 @@
/* Copyright (C) 1997 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>
#include <sys/types.h>
#include <sys/socket.h>
/* Standard interface flags. */
enum
{
IFF_UP = 0x1, /* Interface is up. */
IFF_BROADCAST = 0x2, /* Broadcast address valid. */
IFF_DEBUG = 0x4, /* Turn on debugging. */
IFF_LOOPBACK = 0x8, /* Is a loopback net. */
IFF_POINTOPOINT = 0x10, /* Interface is point-to-point link. */
IFF_NOTRAILERS = 0x20, /* Avoid use of trailers. */
IFF_RUNNING = 0x40, /* Resources allocated. */
IFF_NOARP = 0x80, /* No address resolution protocol. */
IFF_PROMISC = 0x100, /* Receive all packets. */
/* Not supported */
IFF_ALLMULTI = 0x200, /* Receive all multicast packets. */
IFF_MASTER = 0x400, /* Master of a load balancer. */
IFF_SLAVE = 0x800, /* Slave of a load balancer. */
IFF_MULTICAST = 0x1000 /* Supports multicast. */
};
/* The ifaddr structure contains information about one address of an
interface. They are maintained by the different address families,
are allocated and attached when an address is set, and are linked
together so all addresses for an interface can be located. */
struct ifaddr
{
struct sockaddr ifa_addr; /* Address of interface. */
union
{
struct sockaddr ifu_broadaddr;
struct sockaddr ifu_dstaddr;
} ifa_ifu;
struct iface *ifa_ifp; /* Back-pointer to interface. */
struct ifaddr *ifa_next; /* Next address for interface. */
};
#define ifa_broadaddr ifa_ifu.ifu_broadaddr /* broadcast address */
#define ifa_dstaddr ifa_ifu.ifu_dstaddr /* other end of link */
/* Device mapping structure. I'd just gone off and designed a
beautiful scheme using only loadable modules with arguments for
driver options and along come the PCMCIA people 8)
Ah well. The get() side of this is good for WDSETUP, and it'll be
handy for debugging things. The set side is fine for now and being
very small might be worth keeping for clean configuration. */
struct ifmap
{
unsigned long int mem_start;
unsigned long int mem_end;
unsigned short int base_addr;
unsigned char irq;
unsigned char dma;
unsigned char port;
/* 3 bytes spare */
};
/* Interface request structure used for socket ioctl's. All interface
ioctl's must have parameter definitions which begin with ifr_name.
The remainder may be interface specific. */
struct ifreq
{
#define IFHWADDRLEN 6
#define IFNAMSIZ 16
union
{
char ifrn_name[IFNAMSIZ]; /* Interface name, e.g. "en0". */
} ifr_ifrn;
union
{
struct sockaddr ifru_addr;
struct sockaddr ifru_dstaddr;
struct sockaddr ifru_broadaddr;
struct sockaddr ifru_netmask;
struct sockaddr ifru_hwaddr;
short int ifru_flags;
int ifru_ivalue;
int ifru_mtu;
struct ifmap ifru_map;
char ifru_slave[IFNAMSIZ]; /* Just fits the size */
__caddr_t ifru_data;
} ifr_ifru;
};
#define ifr_name ifr_ifrn.ifrn_name /* interface name */
#define ifr_hwaddr ifr_ifru.ifru_hwaddr /* MAC address */
#define ifr_addr ifr_ifru.ifru_addr /* address */
#define ifr_dstaddr ifr_ifru.ifru_dstaddr /* other end of p-p lnk */
#define ifr_broadaddr ifr_ifru.ifru_broadaddr /* broadcast address */
#define ifr_netmask ifr_ifru.ifru_netmask /* interface net mask */
#define ifr_flags ifr_ifru.ifru_flags /* flags */
#define ifr_metric ifr_ifru.ifru_ivalue /* metric */
#define ifr_mtu ifr_ifru.ifru_mtu /* mtu */
#define ifr_map ifr_ifru.ifru_map /* device map */
#define ifr_slave ifr_ifru.ifru_slave /* slave device */
#define ifr_data ifr_ifru.ifru_data /* for use by interface */
#define ifr_ifindex ifr_ifru..ifru_ivalue /* interface index */
#define _IOT_ifreq \
_IOT(_IOTS(struct ifreq),1,0,0,0,0)
/* Structure used in SIOCGIFCONF request. Used to retrieve interface
configuration for machine (useful for programs which must know all
networks accessible). */
struct ifconf
{
int ifc_len; /* Size of buffer. */
union
{
__caddr_t ifcu_buf;
struct ifreq *ifcu_req;
} ifc_ifcu;
};
#define ifc_buf ifc_ifcu.ifcu_buf /* Buffer address. */
#define ifc_req ifc_ifcu.ifcu_req /* Array of structures. */
#define _IOT_ifconf \
_IOT(_IOTS(struct ifconf),1,0,0,0,0)
/* Convert an interface name to an index, and vice versa. */
unsigned int if_nametoindex(const char *ifname);
char *if_indextoname(unsigned int ifindex, char *ifname);
/* 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", .... */
};
struct if_nameindex *if_nameindex(void);
/* Free the data returned from if_nameindex. */
void if_freenameindex(struct if_nameindex *ptr);
#endif /* net/if.h */

1
sysdeps/unix/sysv/linux/Dist
View File

@ -23,7 +23,6 @@ socketcall.h
sysctl.c
termio.h
net/ethernet.h
net/if.h
net/if_arp.h
net/if_packet.h
net/if_ppp.h

2
sysdeps/unix/sysv/linux/Makefile
View File

@ -66,7 +66,7 @@ sysdep_routines += ntp_gettime
endif
ifeq ($(subdir),socket)
sysdep_headers += net/if.h net/if_ppp.h net/ppp-comp.h \
sysdep_headers += net/if_ppp.h net/ppp-comp.h \
net/ppp_defs.h net/if_arp.h net/route.h net/ethernet.h \
net/if_slip.h net/if_packet.h net/if_shaper.h
sysdep_routines += cmsg_nxthdr sa_len