X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=modules%2Fbsd-comp.c;h=fb52aa29e2fb1411af430c2688f7337b416c5d0a;hb=36099775a4e40a7a7b85191486db284fa0e8338f;hp=c342d98c64d427932ed15f34d85578bde1ebb650;hpb=de869d51faadbc33e92f3db04ae6db40955b944a;p=ppp.git

diff --git a/modules/bsd-comp.c b/modules/bsd-comp.c
index c342d98..fb52aa2 100644
--- a/modules/bsd-comp.c
+++ b/modules/bsd-comp.c
@@ -39,42 +39,42 @@
 
 /*
  * This version is for use with STREAMS under SunOS 4.x,
- * DEC Alpha OSF/1, and AIX 4.x.
+ * Digital UNIX, AIX 4.x, and SVR4 systems including Solaris 2.
  *
- * $Id: bsd-comp.c,v 1.9 1995/04/28 06:13:56 paulus Exp $
+ * $Id: bsd-comp.c,v 1.21 2004/01/17 05:47:55 carlsonj Exp $
  */
 
-#ifdef __aix4__
+#ifdef AIX4
 #include <net/net_globals.h>
 #endif
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stream.h>
-#include <sys/socket.h>
-#include <net/if.h>
 #include <net/ppp_defs.h>
-#include <net/ppp_str.h>
+#include "ppp_mod.h"
 
-#ifdef sun
-#include <sys/kmem_alloc.h>
-#define ALLOCATE(n)	kmem_alloc((n), KMEM_NOSLEEP)
-#define FREE(p, n)	kmem_free((p), (n))
+#ifdef SVR4
+#include <sys/byteorder.h>
+#ifndef _BIG_ENDIAN
+#define BSD_LITTLE_ENDIAN
+#endif
 #endif
 
 #ifdef __osf__
-#include <kern/kalloc.h>
-#define ALLOCATE(n)	kalloc((n))
-#define FREE(p, n)	kfree((p), (n))
+#undef FIRST
+#undef LAST
+#define BSD_LITTLE_ENDIAN
 #endif
 
-#ifdef __aix4__
-#define ALLOCATE(n)	xmalloc((n), 0, pinned_heap)
-#define FREE(p, n)	xmfree((p), pinned_heap)
+#ifdef SOL2
+#include <sys/sunddi.h>
 #endif
 
 #define PACKETPTR	mblk_t *
 #include <net/ppp-comp.h>
 
+#if DO_BSD_COMPRESS
+
 /*
  * PPP "BSD compress" compression
  *  The differences between this compression and the classic BSD LZW
@@ -146,21 +146,21 @@ struct bsd_db {
 };
 
 #define BSD_OVHD	2		/* BSD compress overhead/packet */
-#define BSD_INIT_BITS	MIN_BSD_BITS
-
-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 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,
-				  mblk_t *mp, int slen, int maxolen));
-static void	bsd_incomp __P((void *state, mblk_t *dmsg));
-static int	bsd_decompress __P((void *state, mblk_t *cmp, mblk_t **dmpp));
-static void	bsd_reset __P((void *state));
-static void	bsd_comp_stats __P((void *state, struct compstat *stats));
+#define BSD_INIT_BITS	BSD_MIN_BITS
+
+static void	*bsd_comp_alloc(u_char *options, int opt_len);
+static void	*bsd_decomp_alloc(u_char *options, int opt_len);
+static void	bsd_free(void *state);
+static int	bsd_comp_init(void *state, u_char *options, int opt_len,
+				   int unit, int hdrlen, int debug);
+static int	bsd_decomp_init(void *state, u_char *options, int opt_len,
+				     int unit, int hdrlen, int mru, int debug);
+static int	bsd_compress(void *state, mblk_t **mret,
+				  mblk_t *mp, int slen, int maxolen);
+static void	bsd_incomp(void *state, mblk_t *dmsg);
+static int	bsd_decompress(void *state, mblk_t *cmp, mblk_t **dmpp);
+static void	bsd_reset(void *state);
+static void	bsd_comp_stats(void *state, struct compstat *stats);
 
 /*
  * Procedures exported to ppp_comp.c.
@@ -219,7 +219,6 @@ bsd_clear(db)
     db->ratio = 0;
     db->bytes_out = 0;
     db->in_count = 0;
-    db->incomp_count = 0;
     db->checkpoint = CHECK_GAP;
 }
 
@@ -330,6 +329,7 @@ bsd_alloc(options, opt_len, decomp)
     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]);
     switch (bits) {
     case 9:			/* needs 82152 for both directions */
@@ -361,7 +361,11 @@ bsd_alloc(options, opt_len, decomp)
 
     maxmaxcode = MAXCODE(bits);
     newlen = sizeof(*db) + (hsize-1) * (sizeof(db->dict[0]));
-    db = (struct bsd_db *) ALLOCATE(newlen);
+#ifdef __osf__
+    db = (struct bsd_db *) ALLOC_SLEEP(newlen);
+#else
+    db = (struct bsd_db *) ALLOC_NOSLEEP(newlen);
+#endif
     if (!db)
 	return NULL;
     bzero(db, sizeof(*db) - sizeof(db->dict));
@@ -369,7 +373,11 @@ bsd_alloc(options, opt_len, decomp)
     if (!decomp) {
 	db->lens = NULL;
     } else {
-	db->lens = (u_short *) ALLOCATE((maxmaxcode+1) * sizeof(db->lens[0]));
+#ifdef __osf__
+	db->lens = (u_short *) ALLOC_SLEEP((maxmaxcode+1) * sizeof(db->lens[0]));
+#else
+	db->lens = (u_short *) ALLOC_NOSLEEP((maxmaxcode+1) * sizeof(db->lens[0]));
+#endif
 	if (!db->lens) {
 	    FREE(db, newlen);
 	    return NULL;
@@ -423,7 +431,8 @@ bsd_init(db, options, opt_len, unit, hdrlen, mru, debug, decomp)
 {
     int i;
 
-    if (opt_len != 3 || options[0] != CI_BSD_COMPRESS || options[1] != 3
+    if (opt_len < CILEN_BSD_COMPRESS
+	|| options[0] != CI_BSD_COMPRESS || options[1] != CILEN_BSD_COMPRESS
 	|| BSD_VERSION(options[2]) != BSD_CURRENT_VERSION
 	|| BSD_NBITS(options[2]) != db->maxbits
 	|| decomp && db->lens == NULL)
@@ -735,7 +744,6 @@ bsd_incomp(state, dmsg)
     if (ent < 0x21 || ent > 0xf9)
 	return;
 
-    db->incomp_count++;
     db->seqno++;
     ilen = 1;		/* count the protocol as 1 byte */
     rptr += PPP_HDRLEN;
@@ -1109,3 +1117,4 @@ bsd_decompress(state, cmsg, dmpp)
     *dmpp = mret;
     return DECOMP_OK;
 }
+#endif /* DO_BSD_COMPRESS */