/*
* This version is for use with STREAMS under SunOS 4.x,
- * DEC Alpha OSF/1, and AIX 4.x.
+ * DEC Alpha OSF/1, AIX 4.x, and SVR4 systems including Solaris 2.
*
- * $Id: bsd-comp.c,v 1.12 1995/05/19 03:48:34 paulus Exp $
+ * $Id: bsd-comp.c,v 1.18 1996/01/18 03:12:53 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>
-
-#ifdef sun
-#ifdef __svr4__ /* SunOS 5.x */
-#include <sys/kmem.h>
-#define ALLOCATE(n) kmem_alloc((n), KM_NOSLEEP)
-#else /* SunOS 4.x */
-#include <sys/kmem_alloc.h>
-#define ALLOCATE(n) kmem_alloc((n), KMEM_NOSLEEP)
-#endif
-#define FREE(p, n) kmem_free((p), (n))
-#endif
+#include "ppp_mod.h"
-#ifdef __osf__
-#include <kern/kalloc.h>
-#define ALLOCATE(n) kalloc((n))
-#define FREE(p, n) kfree((p), (n))
+#ifdef SVR4
+#include <sys/byteorder.h>
+#ifndef _BIG_ENDIAN
+#define BSD_LITTLE_ENDIAN
+#endif
#endif
-#ifdef __aix4__
-#define ALLOCATE(n) xmalloc((n), 0, pinned_heap)
-#define FREE(p, n) xmfree((p), pinned_heap)
+#ifdef OSF1
+#undef FIRST
+#undef LAST
+#define BSD_LITTLE_ENDIAN
#endif
#define PACKETPTR mblk_t *
maxmaxcode = MAXCODE(bits);
newlen = sizeof(*db) + (hsize-1) * (sizeof(db->dict[0]));
- db = (struct bsd_db *) ALLOCATE(newlen);
+ db = (struct bsd_db *) ALLOC_NOSLEEP(newlen);
if (!db)
return NULL;
bzero(db, sizeof(*db) - sizeof(db->dict));
if (!decomp) {
db->lens = NULL;
} else {
- db->lens = (u_short *) ALLOCATE((maxmaxcode+1) * sizeof(db->lens[0]));
+ db->lens = (u_short *) ALLOC_NOSLEEP((maxmaxcode+1) * sizeof(db->lens[0]));
if (!db->lens) {
FREE(db, newlen);
return NULL;
{
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)