/*
* This version is for use with STREAMS under SunOS 4.x,
- * DEC Alpha OSF/1, AIX 4.x, and SVR4 systems including Solaris 2.
+ * Digital UNIX, AIX 4.x, and SVR4 systems including Solaris 2.
*
- * $Id: bsd-comp.c,v 1.14 1995/06/23 01:52:17 paulus Exp $
+ * $Id: bsd-comp.c,v 1.20 1996/08/28 06:31:57 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 __svr4__ /* SVR4, including SunOS 5.x */
-# include <sys/kmem.h>
-# define ALLOCATE(n) kmem_alloc((n), KM_NOSLEEP)
-# define FREE(p, n) kmem_free((p), (n))
-#else /* SunOS 4.x */
-# ifdef sun
-# include <sys/kmem_alloc.h>
-# define ALLOCATE(n) kmem_alloc((n), KMEM_NOSLEEP)
-# define FREE(p, n) kmem_free((p), (n))
-# endif
+#include "ppp_mod.h"
+
+#ifdef SVR4
+#include <sys/byteorder.h>
+#ifndef _BIG_ENDIAN
+#define BSD_LITTLE_ENDIAN
+#endif
#endif
#ifdef __osf__
-#include <kern/kalloc.h>
-#ifdef FIRST
#undef FIRST
#undef LAST
-#endif
-#ifdef FREE
-#undef FREE
-#endif
-#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)
+#define BSD_LITTLE_ENDIAN
#endif
#define PACKETPTR mblk_t *
db->ratio = 0;
db->bytes_out = 0;
db->in_count = 0;
- db->incomp_count = 0;
db->checkpoint = CHECK_GAP;
}
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 */
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));
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;
{
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)
if (ent < 0x21 || ent > 0xf9)
return;
- db->incomp_count++;
db->seqno++;
ilen = 1; /* count the protocol as 1 byte */
rptr += PPP_HDRLEN;