added extended asyncmap, ultrix mods, extra flag bits

for debugging etc., changed PPP_HEADER_LEN to PPP_HDRLEN
and PPP_FCS_LEN to PPP_FCSLEN

1 files changed, 57 insertions, 28 deletions

diff --git a/include/net/if_ppp.h b/include/net/if_ppp.h
index e519739..54d1223 100644
--- a/include/net/if_ppp.h
+++ b/include/net/if_ppp.h
@@ -16,15 +16,11 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * Modified by Paul Mackerras (paulus@cs.anu.edu.au)
- * Added PPP_MRU, sc_outm, sc_fastq, sc_bpf.
- *
- * if_ppp.h,v 1.2 1993/08/31 00:05:31 paulus Exp
+ * $Id: if_ppp.h,v 1.2 1994/04/18 05:07:11 paulus Exp $
  */
 
-/* Portions Copyright (C) 1990 Brad K. Clements (streams support)
-   (huh?  there isn't any streams support in this file)
-*/
+#ifndef _IF_PPP_H_
+#define _IF_PPP_H_
 
 /*
  * Standard PPP header.
@@ -35,8 +31,8 @@ struct ppp_header {
 	u_short	ph_protocol;	/* Protocol Field */
 };
 
-#define PPP_HEADER_LEN	4	/* octets, must == sizeof(struct ppp_header) */
-#define PPP_FCS_LEN	2	/* octets for FCS */
+#define PPP_HDRLEN	4	/* sizeof(struct ppp_header) must be 4 */
+#define PPP_FCSLEN	2	/* octets for FCS */
 
 #define	PPP_ALLSTATIONS	0xff	/* All-Stations broadcast address */
 #define	PPP_UI		0x03	/* Unnumbered Information */
@@ -45,13 +41,15 @@ struct ppp_header {
 #define	PPP_TRANS	0x20	/* Asynchronous transparency modifier */
 
 /*
- * Protocol types.
+ * Protocol field values.
  */
 #define PPP_IP		0x21	/* Internet Protocol */
 #define	PPP_XNS		0x25	/* Xerox NS */
 #define	PPP_VJC_COMP	0x2d	/* VJ compressed TCP */
 #define	PPP_VJC_UNCOMP	0x2f	/* VJ uncompressed TCP */
+#define PPP_COMP	0xfd	/* compressed packet */
 #define PPP_LCP		0xc021	/* Link Control Protocol */
+#define PPP_CCP		0x80fd	/* Compression Control Protocol */
 
 /*
  * Important FCS values.
@@ -60,15 +58,38 @@ struct ppp_header {
 #define PPP_GOODFCS	0xf0b8	/* Good final FCS value */
 #define PPP_FCS(fcs, c)	(((fcs) >> 8) ^ fcstab[((fcs) ^ (c)) & 0xff])
 
+/*
+ * Packet sizes
+ */
 #define	PPP_MTU		1500	/* Default MTU (size of Info field) */
 #define PPP_MRU		1500	/* Default MRU (max receive unit) */
 #define PPP_MAXMRU	65000	/* Largest MRU we allow */
-#define	PPP_HIWAT	400	/* Don't start a new packet if HIWAT on que */
 
+/* Extended asyncmap - allows any character to be escaped. */
+typedef u_long	ext_accm[8];
+
+/*
+ * Structure describing each ppp unit.
+ */
 struct ppp_softc {
 	struct ifnet sc_if;	/* network-visible interface */
 	u_int	sc_flags;	/* see below */
-	struct	tty *sc_ttyp;	/* pointer to tty structure */
+	void	*sc_devp;	/* pointer to device-dependent structure */
+	int	(*sc_start)();	/* start routine */
+	short	sc_mru;		/* max receive unit */
+	pid_t	sc_xfer;	/* used in xferring unit to another dev */
+	struct	ifqueue sc_inq;	/* TTY side input queue */
+	struct	ifqueue sc_fastq; /* IP interactive output packet queue */
+#ifdef	VJC
+	struct	slcompress sc_comp; /* vjc control buffer */
+#endif
+	u_int	sc_bytessent;	/* count of octets sent *
+	u_int	sc_bytesrcvd;	/* count of octets received */
+	caddr_t	sc_bpf;		/* hook for BPF */
+	
+	/* Device-dependent part for async lines. */
+	u_long	sc_asyncmap[8];	/* async control character map */
+	u_long	sc_rasyncmap;	/* receive async control char map */
 	struct	mbuf *sc_outm;	/* mbuf chain being output currently */
 	struct	mbuf *sc_m;	/* pointer to input mbuf chain */
 	struct	mbuf *sc_mc;	/* pointer to current input mbuf */
@@ -76,17 +97,8 @@ struct ppp_softc {
 	short	sc_ilen;	/* length of input-packet-so-far */
 	u_short	sc_fcs;		/* FCS so far (input) */
 	u_short	sc_outfcs;	/* FCS so far for output packet */
-	short	sc_mru;		/* max receive unit */
-	u_long	sc_asyncmap;	/* async control character map */
-	u_long	sc_rasyncmap;	/* receive async control char map */
-	struct	ifqueue sc_inq;	/* TTY side input queue */
-	struct	ifqueue sc_fastq; /* IP interactive output packet queue */
-#ifdef	VJC
-	struct	slcompress sc_comp; /* vjc control buffer */
-#endif
-	u_int	sc_bytessent;
-	u_int	sc_bytesrcvd;
-	caddr_t	sc_bpf;
+	u_char	sc_rawin[16];	/* chars as received */
+	int	sc_rawin_count;	/* # in sc_rawin */
 };
 
 /* flags */
@@ -96,13 +108,21 @@ struct ppp_softc {
 #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_MASK		0x0000ffff	/* bits that user can change */
+#define SC_ENABLE_IP	0x00000100	/* IP packets may be exchanged */
+#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		0x0fffffff	/* bits that user can change */
 
 /* state bits */
-#define	SC_ESCAPED	0x00010000	/* saw a PPP_ESCAPE */
-#define	SC_FLUSH	0x00020000	/* flush input until next PPP_FLAG */
-
-#define t_sc T_LINEP
+#define	SC_ESCAPED	0x80000000	/* saw a PPP_ESCAPE */
+#define	SC_FLUSH	0x40000000	/* flush input until next PPP_FLAG */
+#define SC_RCV_B7_0	0x01000000	/* have rcvd char with bit 7 = 0 */
+#define SC_RCV_B7_1	0x02000000	/* have rcvd char with bit 7 = 0 */
+#define SC_RCV_EVNP	0x04000000	/* have rcvd char with even parity */
+#define SC_RCV_ODDP	0x08000000	/* have rcvd char with odd parity */
 
 /* this stuff doesn't belong here... */
 #define	PPPIOCGFLAGS	_IOR('t', 90, int)	/* get configuration flags */
@@ -114,9 +134,18 @@ struct ppp_softc {
 #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 */
+
+#ifdef ultrix 
+#define ifr_mtu ifr_ifru.ifru_metric
+#endif
 
 /* old copies of PPP may have defined this */
 #if !defined(ifr_mtu)
 #define ifr_mtu	ifr_metric
 #endif
 
+#endif /* _IF_PPP_H_ */