mirror of
				https://sourceware.org/git/glibc.git
				synced 2025-10-31 22:10:34 +03:00 
			
		
		
		
	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.
		
	
		
			
				
	
	
		
			172 lines
		
	
	
		
			6.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			172 lines
		
	
	
		
			6.6 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*	From: if_ppp.h,v 1.3 1995/06/12 11:36:50 paulus Exp */
 | |
| 
 | |
| /*
 | |
|  * if_ppp.h - Point-to-Point Protocol definitions.
 | |
|  *
 | |
|  * Copyright (c) 1989 Carnegie Mellon University.
 | |
|  *
 | |
|  * 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.
 | |
|  * 2. Redistributions in binary form must reproduce the above copyright
 | |
|  *    notice, this list of conditions and the following disclaimer in the
 | |
|  *    documentation and/or other materials provided with the distribution.
 | |
|  * 3. Neither the name of the University nor the names of its contributors
 | |
|  *    may be used to endorse or promote products derived from this software
 | |
|  *    without specific prior written permission.
 | |
|  *
 | |
|  * THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY AND
 | |
|  * CONTRIBUTORS "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 THE UNIVERSITY OR CONTRIBUTORS 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.
 | |
|  *
 | |
|  */
 | |
| 
 | |
| /*
 | |
|  *  ==FILEVERSION 960926==
 | |
|  *
 | |
|  *  NOTE TO MAINTAINERS:
 | |
|  *     If you modify this file at all, please set the above date.
 | |
|  *     if_ppp.h is shipped with a PPP distribution as well as with the kernel;
 | |
|  *     if everyone increases the FILEVERSION number above, then scripts
 | |
|  *     can do the right thing when deciding whether to install a new if_ppp.h
 | |
|  *     file.  Don't change the format of that line otherwise, so the
 | |
|  *     installation script can recognize it.
 | |
|  */
 | |
| 
 | |
| 
 | |
| #ifndef __NET_IF_PPP_H
 | |
| #define __NET_IF_PPP_H 1
 | |
| 
 | |
| #include <sys/types.h>
 | |
| #include <stdint.h>
 | |
| #include <net/if.h>
 | |
| #include <sys/ioctl.h>
 | |
| #include <net/ppp_defs.h>
 | |
| 
 | |
| __BEGIN_DECLS
 | |
| 
 | |
| /*
 | |
|  * Packet sizes
 | |
|  */
 | |
| 
 | |
| #define	PPP_MTU		1500	/* Default MTU (size of Info field) */
 | |
| #define PPP_MAXMRU	65000	/* Largest MRU we allow */
 | |
| #define PPP_VERSION	"2.2.0"
 | |
| #define PPP_MAGIC	0x5002	/* Magic value for the ppp structure */
 | |
| #define PROTO_IPX	0x002b	/* protocol numbers */
 | |
| #define PROTO_DNA_RT    0x0027  /* DNA Routing */
 | |
| 
 | |
| 
 | |
| /*
 | |
|  * Bit definitions for flags.
 | |
|  */
 | |
| 
 | |
| #define SC_COMP_PROT	0x00000001	/* protocol compression (output) */
 | |
| #define SC_COMP_AC	0x00000002	/* header compression (output) */
 | |
| #define	SC_COMP_TCP	0x00000004	/* TCP (VJ) compression (output) */
 | |
| #define SC_NO_TCP_CCID	0x00000008	/* disable VJ connection-id comp. */
 | |
| #define SC_REJ_COMP_AC	0x00000010	/* reject adrs/ctrl comp. on input */
 | |
| #define SC_REJ_COMP_TCP	0x00000020	/* reject TCP (VJ) comp. on input */
 | |
| #define SC_CCP_OPEN	0x00000040	/* Look at CCP packets */
 | |
| #define SC_CCP_UP	0x00000080	/* May send/recv compressed packets */
 | |
| #define SC_ENABLE_IP	0x00000100	/* IP packets may be exchanged */
 | |
| #define SC_COMP_RUN	0x00001000	/* compressor has been inited */
 | |
| #define SC_DECOMP_RUN	0x00002000	/* decompressor has been inited */
 | |
| #define SC_DEBUG	0x00010000	/* enable debug messages */
 | |
| #define SC_LOG_INPKT	0x00020000	/* log contents of good pkts recvd */
 | |
| #define SC_LOG_OUTPKT	0x00040000	/* log contents of pkts sent */
 | |
| #define SC_LOG_RAWIN	0x00080000	/* log all chars received */
 | |
| #define SC_LOG_FLUSH	0x00100000	/* log all chars flushed */
 | |
| #define	SC_MASK		0x0fE0ffff	/* bits that user can change */
 | |
| 
 | |
| /* state bits */
 | |
| #define	SC_ESCAPED	0x80000000	/* saw a PPP_ESCAPE */
 | |
| #define	SC_FLUSH	0x40000000	/* flush input until next PPP_FLAG */
 | |
| #define SC_VJ_RESET	0x20000000	/* Need to reset the VJ decompressor */
 | |
| #define SC_XMIT_BUSY	0x10000000	/* ppp_write_wakeup is active */
 | |
| #define SC_RCV_ODDP	0x08000000	/* have rcvd char with odd parity */
 | |
| #define SC_RCV_EVNP	0x04000000	/* have rcvd char with even parity */
 | |
| #define SC_RCV_B7_1	0x02000000	/* have rcvd char with bit 7 = 1 */
 | |
| #define SC_RCV_B7_0	0x01000000	/* have rcvd char with bit 7 = 0 */
 | |
| #define SC_DC_FERROR	0x00800000	/* fatal decomp error detected */
 | |
| #define SC_DC_ERROR	0x00400000	/* non-fatal decomp error detected */
 | |
| 
 | |
| /*
 | |
|  * Ioctl definitions.
 | |
|  */
 | |
| 
 | |
| struct npioctl {
 | |
|     int		protocol;	/* PPP protocol, e.g. PPP_IP */
 | |
|     enum NPmode	mode;
 | |
| };
 | |
| 
 | |
| /* Structure describing a CCP configuration option, for PPPIOCSCOMPRESS */
 | |
| struct ppp_option_data {
 | |
| 	uint8_t  *ptr;
 | |
| 	uint32_t length;
 | |
| 	int	 transmit;
 | |
| };
 | |
| 
 | |
| /* 'struct ifreq' is only available from net/if.h under __USE_MISC.  */
 | |
| #ifdef __USE_MISC
 | |
| struct ifpppstatsreq {
 | |
|   struct ifreq	   b;
 | |
|   struct ppp_stats stats;			/* statistic information */
 | |
| };
 | |
| 
 | |
| struct ifpppcstatsreq {
 | |
|   struct ifreq		b;
 | |
|   struct ppp_comp_stats stats;
 | |
| };
 | |
| 
 | |
| #define ifr__name       b.ifr_ifrn.ifrn_name
 | |
| #define stats_ptr       b.ifr_ifru.ifru_data
 | |
| #endif
 | |
| 
 | |
| /*
 | |
|  * Ioctl definitions.
 | |
|  */
 | |
| 
 | |
| #define	PPPIOCGFLAGS	_IOR('t', 90, int)	/* get configuration flags */
 | |
| #define	PPPIOCSFLAGS	_IOW('t', 89, int)	/* set configuration flags */
 | |
| #define	PPPIOCGASYNCMAP	_IOR('t', 88, int)	/* get async map */
 | |
| #define	PPPIOCSASYNCMAP	_IOW('t', 87, int)	/* set async map */
 | |
| #define	PPPIOCGUNIT	_IOR('t', 86, int)	/* get ppp unit number */
 | |
| #define	PPPIOCGRASYNCMAP _IOR('t', 85, int)	/* get receive async map */
 | |
| #define	PPPIOCSRASYNCMAP _IOW('t', 84, int)	/* set receive async map */
 | |
| #define	PPPIOCGMRU	_IOR('t', 83, int)	/* get max receive unit */
 | |
| #define	PPPIOCSMRU	_IOW('t', 82, int)	/* set max receive unit */
 | |
| #define	PPPIOCSMAXCID	_IOW('t', 81, int)	/* set VJ max slot ID */
 | |
| #define PPPIOCGXASYNCMAP _IOR('t', 80, ext_accm) /* get extended ACCM */
 | |
| #define PPPIOCSXASYNCMAP _IOW('t', 79, ext_accm) /* set extended ACCM */
 | |
| #define PPPIOCXFERUNIT	_IO('t', 78)		/* transfer PPP unit */
 | |
| #define PPPIOCSCOMPRESS	_IOW('t', 77, struct ppp_option_data)
 | |
| #define PPPIOCGNPMODE	_IOWR('t', 76, struct npioctl) /* get NP mode */
 | |
| #define PPPIOCSNPMODE	_IOW('t', 75, struct npioctl)  /* set NP mode */
 | |
| #define PPPIOCGDEBUG	_IOR('t', 65, int)	/* Read debug level */
 | |
| #define PPPIOCSDEBUG	_IOW('t', 64, int)	/* Set debug level */
 | |
| #define PPPIOCGIDLE	_IOR('t', 63, struct ppp_idle) /* get idle time */
 | |
| 
 | |
| #define SIOCGPPPSTATS   (SIOCDEVPRIVATE + 0)
 | |
| #define SIOCGPPPVER     (SIOCDEVPRIVATE + 1)  /* NEVER change this!! */
 | |
| #define SIOCGPPPCSTATS  (SIOCDEVPRIVATE + 2)
 | |
| 
 | |
| #if !defined(ifr_mtu)
 | |
| #define ifr_mtu	ifr_ifru.ifru_metric
 | |
| #endif
 | |
| 
 | |
| __END_DECLS
 | |
| 
 | |
| #endif /* net/if_ppp.h */
 |