From de869d51faadbc33e92f3db04ae6db40955b944a Mon Sep 17 00:00:00 2001
From: Paul Mackerras <paulus@samba.org>
Date: Fri, 28 Apr 1995 06:13:56 +0000
Subject: [PATCH] removed stuff to ppp-comp.h; added hdrlen param to comp_init
 (ignored)

---
 modules/bsd-comp.c | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/modules/bsd-comp.c b/modules/bsd-comp.c
index d30e0d2..c342d98 100644
--- a/modules/bsd-comp.c
+++ b/modules/bsd-comp.c
@@ -41,7 +41,7 @@
  * This version is for use with STREAMS under SunOS 4.x,
  * DEC Alpha OSF/1, and AIX 4.x.
  *
- * $Id: bsd-comp.c,v 1.8 1994/12/08 00:35:33 paulus Exp $
+ * $Id: bsd-comp.c,v 1.9 1995/04/28 06:13:56 paulus Exp $
  */
 
 #ifdef __aix4__
@@ -97,15 +97,6 @@
  *	    compression is not going well.
  */
 
-/*
- * Macros to extract protocol version and number of bits
- * from the third byte of the BSD Compress CCP configuration option.
- */
-#define BSD_VERSION(x)	((x) >> 5)
-#define BSD_NBITS(x)	((x) & 0x1F)
-
-#define BSD_CURRENT_VERSION	1
-
 /*
  * A dictionary for doing BSD compress.
  */
@@ -155,15 +146,13 @@ struct bsd_db {
 };
 
 #define BSD_OVHD	2		/* BSD compress overhead/packet */
-#define MIN_BSD_BITS	9
 #define BSD_INIT_BITS	MIN_BSD_BITS
-#define MAX_BSD_BITS	15
 
 static void	*bsd_comp_alloc __P((u_char *options, int opt_len));
 static void	*bsd_decomp_alloc __P((u_char *options, int opt_len));
 static void	bsd_free __P((void *state));
 static int	bsd_comp_init __P((void *state, u_char *options, int opt_len,
-				   int unit, int debug));
+				   int unit, int hdrlen, int debug));
 static int	bsd_decomp_init __P((void *state, u_char *options, int opt_len,
 				     int unit, int hdrlen, int mru, int debug));
 static int	bsd_compress __P((void *state, mblk_t **mret,
@@ -177,7 +166,7 @@ static void	bsd_comp_stats __P((void *state, struct compstat *stats));
  * Procedures exported to ppp_comp.c.
  */
 struct compressor ppp_bsd_compress = {
-    0x21,			/* compress_proto */
+    CI_BSD_COMPRESS,		/* compress_proto */
     bsd_comp_alloc,		/* comp_alloc */
     bsd_free,			/* comp_free */
     bsd_comp_init,		/* comp_init */
@@ -202,7 +191,7 @@ struct compressor ppp_bsd_compress = {
 #define LAST	255
 
 #define MAXCODE(b)	((1 << (b)) - 1)
-#define BADCODEM1	MAXCODE(MAX_BSD_BITS);
+#define BADCODEM1	MAXCODE(BSD_MAX_BITS)
 
 #define BSD_HASH(prefix,suffix,hshift)	((((u_int32_t)(suffix)) << (hshift)) \
 					 ^ (u_int32_t)(prefix))
@@ -338,7 +327,7 @@ bsd_alloc(options, opt_len, decomp)
     u_int newlen, hsize, hshift, maxmaxcode;
     struct bsd_db *db;
 
-    if (opt_len != 3 || options[0] != 0x21 || options[1] != 3
+    if (opt_len != 3 || options[0] != CI_BSD_COMPRESS || options[1] != 3
 	|| BSD_VERSION(options[2]) != BSD_CURRENT_VERSION)
 	return NULL;
     bits = BSD_NBITS(options[2]);
@@ -434,7 +423,7 @@ bsd_init(db, options, opt_len, unit, hdrlen, mru, debug, decomp)
 {
     int i;
 
-    if (opt_len != 3 || options[0] != 0x21 || options[1] != 3
+    if (opt_len != 3 || options[0] != CI_BSD_COMPRESS || options[1] != 3
 	|| BSD_VERSION(options[2]) != BSD_CURRENT_VERSION
 	|| BSD_NBITS(options[2]) != db->maxbits
 	|| decomp && db->lens == NULL)
@@ -463,13 +452,13 @@ bsd_init(db, options, opt_len, unit, hdrlen, mru, debug, decomp)
 }
 
 static int
-bsd_comp_init(state, options, opt_len, unit, debug)
+bsd_comp_init(state, options, opt_len, unit, hdrlen, debug)
     void *state;
     u_char *options;
-    int opt_len, unit, debug;
+    int opt_len, unit, hdrlen, debug;
 {
     return bsd_init((struct bsd_db *) state, options, opt_len,
-		    unit, 0, 0, debug, 0);
+		    unit, hdrlen, 0, debug, 0);
 }
 
 static int
@@ -487,6 +476,8 @@ bsd_decomp_init(state, options, opt_len, unit, hdrlen, mru, debug)
  * compress a packet
  *	One change from the BSD compress command is that when the
  *	code size expands, we do not output a bunch of padding.
+ *
+ * N.B. at present, we ignore the hdrlen specified in the comp_init call.
  */
 static int			/* new slen */
 bsd_compress(state, mretp, mp, slen, maxolen)
-- 
2.39.2