X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=include%2Fnet%2Fppp_str.h;h=8dfab1589a8a7a5f3ad41f8a79a991cf06e35ba3;hp=c2ee6c1ff78605b75c4817d3bd5e5f7f279ceba1;hb=5271a2f101bf0e37d673e65466ab29accba03891;hpb=d9bd48c35d1c5d6c26dd746efd93edb4d0de7745

diff --git a/include/net/ppp_str.h b/include/net/ppp_str.h
index c2ee6c1..8dfab15 100644
--- a/include/net/ppp_str.h
+++ b/include/net/ppp_str.h
@@ -44,25 +44,106 @@
 #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_HDRLEN	4	/* sizeof(struct ppp_header) must be 4 */
+
+/*
+ * A 32-bit unsigned integral type.
+ */
+#ifdef	UINT32_T
+typedef UINT32_T	u_int32_t;
+#else
+typedef unsigned long	u_int32_t;
+#endif
 
 /* Extended asyncmap - allows any character to be escaped. */
-typedef u_long	ext_accm[8];
+typedef u_int32_t	ext_accm[8];
+
+/*
+ * Statistics.
+ */
+struct pppstat	{
+    u_int	ppp_ibytes;	/* bytes received */
+    u_int	ppp_ipackets;	/* packets received */
+    u_int	ppp_ierrors;	/* receive errors */
+    u_int	ppp_obytes;	/* bytes sent */
+    u_int	ppp_opackets;	/* packets sent */
+    u_int	ppp_oerrors;	/* transmit errors */
+};
+
+struct vjstat {
+    u_int	sls_packets;	/* outbound packets */
+    u_int	sls_compressed;	/* outbound compressed packets */
+    u_int	sls_searches;	/* searches for connection state */
+    u_int	sls_misses;	/* times couldn't find conn. state */
+    u_int	sls_uncompressedin; /* inbound uncompressed packets */
+    u_int	sls_compressedin;   /* inbound compressed packets */
+    u_int	sls_errorin;	/* inbound unknown type packets */
+    u_int	sls_tossed;	/* inbound packets tossed because of error */
+};
+
+struct ppp_stats {
+    struct pppstat	p;
+    struct vjstat	vj;
+};
+
+/*
+ * What to do with network protocol (NP) packets.
+ */
+
+enum NPmode {
+    NPMODE_PASS,		/* pass the packet through */
+    NPMODE_DROP,		/* silently drop the packet */
+    NPMODE_ERROR,		/* return an error */
+    NPMODE_QUEUE		/* save it up for later. */
+};
+
+struct npioctl {
+    int		protocol;	/* PPP procotol, e.g. PPP_IP */
+    enum NPmode	mode;
+};
+
+/* Structure describing a CCP configuration option, for SIOCSCOMPRESS */
+#define MAX_PPP_OPTION	32
+struct ppp_option_data {
+	u_int	length;
+	int	transmit;
+	u_char	opt_data[MAX_PPP_OPTION];
+};
+
+/* Bit definitions for SIOC[GS]IFCOMP. */
+#define CCP_ISOPEN	1
+#define CCP_ISUP	2
+#define CCP_COMP_RUN	4
+#define CCP_DECOMP_RUN	8
+#define CCP_ERROR	0x10
+#define CCP_FATALERROR	0x20
+
+/*
+ * Ioctl definitions.
+ */
 
 #ifdef	__STDC__
 #define	SIOCSIFCOMPAC	_IOW('p', 130, char)
 #define	SIOCSIFCOMPPROT	_IOW('p', 131, char)
 #define	SIOCSIFMRU	_IOW('p', 132, int)	/* set max receive unit */
 #define	SIOCGIFMRU	_IOR('p', 133, int)	/* get max receive unit */
-#define	SIOCGIFASYNCMAP	_IOR('p', 134, long)	/* get transmit async map */
-#define	SIOCSIFASYNCMAP	_IOW('p', 135, long)	/* set transmit async map */
+#define	SIOCGIFASYNCMAP	_IOR('p', 134, u_int32_t) /* get transmit async map */
+#define	SIOCSIFASYNCMAP	_IOW('p', 135, u_int32_t) /* set transmit async map */
 #define	SIOCGETU	_IOR('p', 136, int)	/* get unit number */
 #define	SIOCSIFVJCOMP	_IOW('p', 137, char)	/* enable/disable VJ comp */
 #define	SIOCGIFDEBUG	_IOR('p', 138, int)	/* get debug flags */
 #define	SIOCSIFDEBUG	_IOW('p', 139, int)	/* set debug flags */
-#define	SIOCGIFRASYNCMAP _IOR('p', 140, long)	/* get receive async map */
-#define	SIOCSIFRASYNCMAP _IOW('p', 141, long)	/* set receive async map */
+#define	SIOCGIFRASYNCMAP _IOR('p', 140, u_int32_t) /* get receive async map */
+#define	SIOCSIFRASYNCMAP _IOW('p', 141, u_int32_t) /* set receive async map */
 #define	SIOCGIFXASYNCMAP _IOR('p', 142, ext_accm)  /* get extended xmit map */
 #define	SIOCSIFXASYNCMAP _IOW('p', 143, ext_accm)  /* set extended xmit map */
+#define	SIOCSETU	_IOW('p', 144, int)	/* set unit number */
+#define SIOCSETNPMODE	_IOW('p', 145, struct npioctl)	/* set NP mode */
+#define SIOCGETNPMODE	_IOWR('p', 146, struct npioctl)	/* get NP mode */
+#define SIOCGETSTATS	_IOR('p', 147, struct ppp_stats)
+#define SIOCGIFCOMP	_IOR('p', 148, int)	/* get CCP kernel flags */
+#define SIOCSIFCOMP	_IOW('p', 149, int)	/* set CCP closed/open/up */
+#define SIOCSCOMPRESS	_IOW('p', 150, struct ppp_option_data)
 
 #else
 /* traditional C compiler */
@@ -70,16 +151,23 @@ typedef u_long	ext_accm[8];
 #define	SIOCSIFCOMPPROT	_IOW(p, 131, char)
 #define	SIOCSIFMRU	_IOW(p, 132, int)	/* set max receive unit */
 #define	SIOCGIFMRU	_IOR(p, 133, int)	/* get max receive unit */
-#define	SIOCGIFASYNCMAP	_IOR(p, 134, long)	/* get transmit async map */
-#define	SIOCSIFASYNCMAP	_IOW(p, 135, long)	/* set transmit async map */
+#define	SIOCGIFASYNCMAP	_IOR(p, 134, u_int32_t)	/* get transmit async map */
+#define	SIOCSIFASYNCMAP	_IOW(p, 135, u_int32_t)	/* set transmit async map */
 #define	SIOCGETU	_IOR(p, 136, int)	/* get unit number */
 #define	SIOCSIFVJCOMP	_IOW(p, 137, char)	/* enable/disable VJ comp */
 #define	SIOCGIFDEBUG	_IOR(p, 138, int)	/* get debug flags */
 #define	SIOCSIFDEBUG	_IOW(p, 139, int)	/* set debug flags */
-#define	SIOCGIFRASYNCMAP _IOR(p, 140, long)	/* get receive async map */
-#define	SIOCSIFRASYNCMAP _IOW(p, 141, long)	/* set receive async map */
-#define	SIOCGIFXASYNCMAP _IOR(p, 142, ext_accm)  /* get extended xmit map */
-#define	SIOCSIFXASYNCMAP _IOW(p, 143, ext_accm)  /* set extended xmit map */
+#define	SIOCGIFRASYNCMAP _IOR(p, 140, u_int32_t) /* get receive async map */
+#define	SIOCSIFRASYNCMAP _IOW(p, 141, u_int32_t) /* set receive async map */
+#define	SIOCGIFXASYNCMAP _IOR(p, 142, ext_accm) /* get extended xmit map */
+#define	SIOCSIFXASYNCMAP _IOW(p, 143, ext_accm) /* set extended xmit map */
+#define	SIOCSETU	_IOW(p, 144, int)	/* set unit number */
+#define SIOCSETNPMODE	_IOW(p, 145, struct npioctl)	/* set NP mode */
+#define SIOCGETNPMODE	_IOWR(p, 146, struct npioctl)	/* get NP mode */
+#define SIOCGETSTATS	_IOR(p, 147, struct ppp_stats)
+#define SIOCGIFCOMP	_IOR(p, 148, int)	/* get CCP kernel flags */
+#define SIOCSIFCOMP	_IOW(p, 149, int)	/* set CCP closed/open/up */
+#define SIOCSCOMPRESS	_IOW(p, 150, struct ppp_option_data)
 #endif
 
 /*
@@ -89,34 +177,12 @@ typedef u_long	ext_accm[8];
  * bits 4--7 = maximum slot ID (0 => use default (15)).
  */
 
-/*
- * Structure used within the ppp_if streams module.
- */
-struct	ppp_if_info {
-	int			pii_flags;
-#define	PII_FLAGS_INUSE		0x1	/* in use by  a stream	*/
-#define	PII_FLAGS_ATTACHED	0x8	/* already if_attached	*/
-#define	PII_FLAGS_VJC_ON	0x10	/* VJ TCP header compression enabled */
-#define PII_FLAGS_VJC_NOCCID	0x20	/* VJ: don't compress conn. id */
-#define PII_FLAGS_VJC_REJ	0x40	/* receive: reject VJ comp */
-#define PII_FLAGS_DEBUG		0x80	/* enable debug printout */
-
-	struct	ifnet		pii_ifnet;
-	queue_t			*pii_writeq;	/* used by ppp_output 	*/
-#ifdef	VJC
-	struct 	slcompress	pii_sc_comp;	/* vjc control buffer */
-#endif
-#ifdef	PPP_STATS
-	struct	pppstat	{
-		u_int	ppp_ibytes;
-		u_int	ppp_ipackets;
-		u_int	ppp_ierrors;
-		u_int	ppp_obytes;
-		u_int	ppp_opackets;
-		u_int	ppp_oerrors;
-	}			pii_stats;
-#endif
-};
+/* Bits for SIOCGIFDEBUG */
+#define PAI_FLAGS_B7_0		0x100
+#define PAI_FLAGS_B7_1		0x200
+#define PAI_FLAGS_PAR_EVEN	0x400
+#define PAI_FLAGS_PAR_ODD	0x800
+#define PAI_FLAGS_HIBITS	0xF00
 
 /* defines for streams modules */
 #define       IF_INPUT_ERROR  0xe1
@@ -125,5 +191,10 @@ struct	ppp_if_info {
 #define       ALLOCBSIZE      64              /* how big of a buffer block to
 allocate for each chunk of the input chain */
 
-#define	PPP_MTU		1500	/* Default MTU (size of Info field) */
-#define PPP_HDRLEN	4	/* sizeof(struct ppp_header) must be 4 */
+#ifndef __P
+#ifdef __STDC__
+#define __P(x)	x
+#else
+#define __P(x)	()
+#endif
+#endif