mirror of
https://sourceware.org/git/glibc.git
synced 2025-10-28 23:34:53 +03:00
f2bea4da2e
Several network-related structures are defined conditionally under
__USE_MISC, but unconditionally used by other headers. The path of
least resistance is usually to condition the uses on __USE_MISC as
well.
* sysdeps/mach/hurd/net/if_ppp.h
* sysdeps/unix/sysv/linux/net/if_ppp.h:
Only define struct ifpppstatsreq and struct ifpppcstatsreq
if __USE_MISC is defined, to ensure struct ifreq is declared.
* inet/netinet/ether.h: Condition all function prototypes
on __USE_MISC, to ensure struct ether_addr is declared.
sys/socket.h defines struct osockaddr only under __USE_MISC, whereas
protocols/talkd.h requires it unconditionally. Here it doesn't make
sense to condition the entire body of protocols/talkd.h on __USE_MISC.
Rather than complicate sys/socket.h with a __need macro or duplicate
the definition, I am introducing a new concept: tiny headers named
bits/types/TYPE.h that define TYPE and nothing else. This can, I hope,
ultimately replace *all* the __need macros. The guard macro for such
headers will be __TYPE_defined, just in case application or third-party
library code is looking at them.
* socket/bits/types/struct_osockaddr.h: New header.
* include/bits/types/struct_osockaddr.h: New wrapper.
* socket/Makefile: Install the new header.
* socket/sys/socket.h, inet/protocols/talkd.h:
Refer to bits/types/struct_osockaddr.h for the definition of
struct osockaddr.
56 lines
1.9 KiB
C
56 lines
1.9 KiB
C
/* Functions for storing Ethernet addresses in ASCII and mapping to hostnames.
|
|
Copyright (C) 1996-2016 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, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef _NETINET_ETHER_H
|
|
#define _NETINET_ETHER_H 1
|
|
|
|
#include <features.h>
|
|
|
|
/* Get definition of `struct ether_addr'. */
|
|
#include <netinet/if_ether.h>
|
|
|
|
#ifdef __USE_MISC
|
|
__BEGIN_DECLS
|
|
|
|
/* Convert 48 bit Ethernet ADDRess to ASCII. */
|
|
extern char *ether_ntoa (const struct ether_addr *__addr) __THROW;
|
|
extern char *ether_ntoa_r (const struct ether_addr *__addr, char *__buf)
|
|
__THROW;
|
|
|
|
/* Convert ASCII string S to 48 bit Ethernet address. */
|
|
extern struct ether_addr *ether_aton (const char *__asc) __THROW;
|
|
extern struct ether_addr *ether_aton_r (const char *__asc,
|
|
struct ether_addr *__addr) __THROW;
|
|
|
|
/* Map 48 bit Ethernet number ADDR to HOSTNAME. */
|
|
extern int ether_ntohost (char *__hostname, const struct ether_addr *__addr)
|
|
__THROW;
|
|
|
|
/* Map HOSTNAME to 48 bit Ethernet address. */
|
|
extern int ether_hostton (const char *__hostname, struct ether_addr *__addr)
|
|
__THROW;
|
|
|
|
/* Scan LINE and set ADDR and HOSTNAME. */
|
|
extern int ether_line (const char *__line, struct ether_addr *__addr,
|
|
char *__hostname) __THROW;
|
|
|
|
__END_DECLS
|
|
#endif /* Use misc. */
|
|
|
|
#endif /* netinet/ether.h */
|