update to 2.3 based on netbsd stuff

[ppp.git] / modules / bsd-comp.c

diff --git a/modules/bsd-comp.c b/modules/bsd-comp.c
index b37d363505b61d8075213b15f1489924866e9a56..3d89d70ee7e37f05ad251586c5b40fecfd7db83b 100644 (file)
--- a/modules/bsd-comp.c
+++ b/modules/bsd-comp.c
@@ -39,37 +39,31 @@
 
 /*
  * 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.11 1995/05/02 02:49:09 paulus Exp $
+ * $Id: bsd-comp.c,v 1.19 1996/06/26 00:53:15 paulus 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
-
-#ifdef __osf__
-#include <kern/kalloc.h>
-#define ALLOCATE(n)    kalloc((n))
-#define FREE(p, n)     kfree((p), (n))
 #endif
 
-#ifdef __aix4__
-#define ALLOCATE(n)    xmalloc((n), 0, pinned_heap)
-#define FREE(p, n)     xmfree((p), pinned_heap)
+#ifdef __osf__
+#undef FIRST
+#undef LAST
+#define BSD_LITTLE_ENDIAN
 #endif
 
 #define PACKETPTR      mblk_t *
@@ -332,6 +326,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 */
@@ -363,7 +358,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));
@@ -371,7 +370,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;
@@ -425,7 +428,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)