X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=modules%2Fbsd-comp.c;h=ed88b28f2c5b5c69e0f32261ea9caf54e16caebb;hp=d9e9fe9f1a7764c85cb8a5ce5c38116fd1f95201;hb=1f392dc3fdb21a139298909d40733644e5413f32;hpb=3da550efb3dc7c6dfb697792f5cc8bc7c0f776e3 diff --git a/modules/bsd-comp.c b/modules/bsd-comp.c index d9e9fe9..ed88b28 100644 --- a/modules/bsd-comp.c +++ b/modules/bsd-comp.c @@ -39,9 +39,9 @@ /* * 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.18 1996/01/18 03:12:53 paulus Exp $ + * $Id: bsd-comp.c,v 1.20 1996/08/28 06:31:57 paulus Exp $ */ #ifdef AIX4 @@ -60,7 +60,7 @@ #endif #endif -#ifdef OSF1 +#ifdef __osf__ #undef FIRST #undef LAST #define BSD_LITTLE_ENDIAN @@ -215,7 +215,6 @@ bsd_clear(db) db->ratio = 0; db->bytes_out = 0; db->in_count = 0; - db->incomp_count = 0; db->checkpoint = CHECK_GAP; } @@ -326,6 +325,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 */ @@ -357,7 +357,11 @@ bsd_alloc(options, opt_len, decomp) maxmaxcode = MAXCODE(bits); newlen = sizeof(*db) + (hsize-1) * (sizeof(db->dict[0])); +#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)); @@ -365,7 +369,11 @@ bsd_alloc(options, opt_len, decomp) if (!decomp) { db->lens = NULL; } else { +#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; @@ -732,7 +740,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;