X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=include%2Fnet%2Fppp-comp.h;h=61ee35e3cc882ad54924eca35f8b1934cdfd2f67;hp=906212b99e36447d24420cd4bc8039975816bac7;hb=4d5401a1de510cdbb89cf10bc5956774c62683be;hpb=3d7213eeb3549074c2b6cb961db7a28c65f82d5c

diff --git a/include/net/ppp-comp.h b/include/net/ppp-comp.h
index 906212b..61ee35e 100644
--- a/include/net/ppp-comp.h
+++ b/include/net/ppp-comp.h
@@ -24,12 +24,29 @@
  * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
  * OR MODIFICATIONS.
  *
- * $Id: ppp-comp.h,v 1.4 1994/10/21 06:27:31 paulus Exp $
+ * $Id: ppp-comp.h,v 1.9 1996/01/18 03:18:39 paulus Exp $
  */
 
+#ifndef _NET_PPP_COMP_H
+#define _NET_PPP_COMP_H
+
+/*
+ * The following symbols control whether we include code for
+ * various compression methods.
+ */
+#ifndef DO_BSD_COMPRESS
+#define DO_BSD_COMPRESS	1	/* by default, include BSD-Compress */
+#endif
+#ifndef DO_DEFLATE
+#define DO_DEFLATE	1	/* by default, include Deflate */
+#endif
+#define DO_PREDICTOR_1	0
+#define DO_PREDICTOR_2	0
+
 /*
  * Structure giving methods for compression/decompression.
  */
+#ifdef PACKETPTR
 struct compressor {
 	int	compress_proto;	/* CCP compression protocol number */
 
@@ -39,7 +56,7 @@ struct compressor {
 	void	(*comp_free) __P((void *state));
 	/* Initialize a compressor */
 	int	(*comp_init) __P((void *state, u_char *options, int opt_len,
-				  int unit, int debug));
+				  int unit, int hdrlen, int debug));
 	/* Reset a compressor */
 	void	(*comp_reset) __P((void *state));
 	/* Compress a packet */
@@ -54,7 +71,7 @@ struct compressor {
 	void	(*decomp_free) __P((void *state));
 	/* Initialize a decompressor */
 	int	(*decomp_init) __P((void *state, u_char *options, int opt_len,
-				    int unit, int mru, int debug));
+				    int unit, int hdrlen, int mru, int debug));
 	/* Reset a decompressor */
 	void	(*decomp_reset) __P((void *state));
 	/* Decompress a packet. */
@@ -65,6 +82,7 @@ struct compressor {
 	/* Return decompression statistics */
 	void	(*decomp_stat) __P((void *state, struct compstat *stats));
 };
+#endif /* PACKETPTR */
 
 /*
  * Return values for decompress routine.
@@ -105,3 +123,39 @@ struct compressor {
 #define CCP_OPT_LENGTH(dp)	((dp)[1])
 #define CCP_OPT_MINLEN		2
 
+/*
+ * Definitions for BSD-Compress.
+ */
+#define CI_BSD_COMPRESS		21	/* config. option for BSD-Compress */
+#define CILEN_BSD_COMPRESS	3	/* length of config. option */
+
+/* Macros for handling the 3rd byte of the BSD-Compress config option. */
+#define BSD_NBITS(x)		((x) & 0x1F)	/* number of bits requested */
+#define BSD_VERSION(x)		((x) >> 5)	/* version of option format */
+#define BSD_CURRENT_VERSION	1		/* current version number */
+#define BSD_MAKE_OPT(v, n)	(((v) << 5) | (n))
+
+#define BSD_MIN_BITS		9	/* smallest code size supported */
+#define BSD_MAX_BITS		15	/* largest code size supported */
+
+/*
+ * Definitions for other, as yet unsupported, compression methods.
+ */
+#define CI_PREDICTOR_1		1	/* config option for Predictor-1 */
+#define CILEN_PREDICTOR_1	2	/* length of its config option */
+#define CI_PREDICTOR_2		2	/* config option for Predictor-2 */
+#define CILEN_PREDICTOR_2	2	/* length of its config option */
+
+#define CI_DEFLATE		24	/* config option for Deflate */
+#define CILEN_DEFLATE		4	/* length of its config option */
+
+#define DEFLATE_MIN_SIZE	8
+#define DEFLATE_MAX_SIZE	15
+#define DEFLATE_METHOD_VAL	8
+#define DEFLATE_SIZE(x)		(((x) >> 4) + DEFLATE_MIN_SIZE)
+#define DEFLATE_METHOD(x)	((x) & 0x0F)
+#define DEFLATE_MAKE_OPT(w)	((((w) - DEFLATE_MIN_SIZE) << 4) \
+				 + DEFLATE_METHOD_VAL)
+#define DEFLATE_CHK_SEQUENCE	0
+
+#endif /* _NET_PPP_COMP_H */