X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=modules%2Fbsd-comp.c;h=48bde3125d84dbdd6ace6819b4afd530b9e0e310;hp=dfa73aaa538346266f9f2a5d689200fbcab2a551;hb=1bd5f1186d0bc87dc8383ac3395ef8935e5ba453;hpb=4891176be9475e37377e36e578657288f2b68770 diff --git a/modules/bsd-comp.c b/modules/bsd-comp.c index dfa73aa..48bde31 100644 --- a/modules/bsd-comp.c +++ b/modules/bsd-comp.c @@ -38,23 +38,50 @@ */ /* - * This version is for use with STREAMS under SunOS 4.x. + * This version is for use with STREAMS under SunOS 4.x, + * DEC Alpha OSF/1, and AIX 4.x. * - * $Id: bsd-comp.c,v 1.6 1994/10/24 04:28:14 paulus Exp $ + * $Id: bsd-comp.c,v 1.12 1995/05/19 03:48:34 paulus Exp $ */ +#ifdef __aix4__ +#include +#endif #include #include #include -#include #include #include #include #include +#ifdef sun +#ifdef __svr4__ /* SunOS 5.x */ +#include +#define ALLOCATE(n) kmem_alloc((n), KM_NOSLEEP) +#else /* SunOS 4.x */ +#include +#define ALLOCATE(n) kmem_alloc((n), KMEM_NOSLEEP) +#endif +#define FREE(p, n) kmem_free((p), (n)) +#endif + +#ifdef __osf__ +#include +#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) +#endif + #define PACKETPTR mblk_t * #include +#if DO_BSD_COMPRESS + /* * PPP "BSD compress" compression * The differences between this compression and the classic BSD LZW @@ -77,15 +104,6 @@ * compression is not going well. */ -/* - * Macros to extract protocol version and number of bits - * from the third byte of the BSD Compress CCP configuration option. - */ -#define BSD_VERSION(x) ((x) >> 5) -#define BSD_NBITS(x) ((x) & 0x1F) - -#define BSD_CURRENT_VERSION 1 - /* * A dictionary for doing BSD compress. */ @@ -98,6 +116,7 @@ struct bsd_db { u_char debug; u_char unit; u_short seqno; /* sequence number of next packet */ + u_int hdrlen; /* header length to preallocate */ u_int mru; u_int maxmaxcode; /* largest valid code */ u_int max_ent; /* largest code in use */ @@ -134,17 +153,15 @@ struct bsd_db { }; #define BSD_OVHD 2 /* BSD compress overhead/packet */ -#define MIN_BSD_BITS 9 -#define BSD_INIT_BITS MIN_BSD_BITS -#define MAX_BSD_BITS 15 +#define BSD_INIT_BITS BSD_MIN_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 debug)); + int unit, int hdrlen, int debug)); static int bsd_decomp_init __P((void *state, u_char *options, int opt_len, - int unit, int mru, int debug)); + 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)); @@ -156,7 +173,7 @@ static void bsd_comp_stats __P((void *state, struct compstat *stats)); * Procedures exported to ppp_comp.c. */ struct compressor ppp_bsd_compress = { - 0x21, /* compress_proto */ + CI_BSD_COMPRESS, /* compress_proto */ bsd_comp_alloc, /* comp_alloc */ bsd_free, /* comp_free */ bsd_comp_init, /* comp_init */ @@ -181,7 +198,7 @@ struct compressor ppp_bsd_compress = { #define LAST 255 #define MAXCODE(b) ((1 << (b)) - 1) -#define BADCODEM1 MAXCODE(MAX_BSD_BITS); +#define BADCODEM1 MAXCODE(BSD_MAX_BITS) #define BSD_HASH(prefix,suffix,hshift) ((((u_int32_t)(suffix)) << (hshift)) \ ^ (u_int32_t)(prefix)) @@ -317,7 +334,7 @@ bsd_alloc(options, opt_len, decomp) u_int newlen, hsize, hshift, maxmaxcode; struct bsd_db *db; - if (opt_len != 3 || options[0] != 0x21 || options[1] != 3 + 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]); @@ -351,7 +368,7 @@ bsd_alloc(options, opt_len, decomp) maxmaxcode = MAXCODE(bits); newlen = sizeof(*db) + (hsize-1) * (sizeof(db->dict[0])); - db = (struct bsd_db *) kmem_alloc(newlen, KMEM_NOSLEEP); + db = (struct bsd_db *) ALLOCATE(newlen); if (!db) return NULL; bzero(db, sizeof(*db) - sizeof(db->dict)); @@ -359,10 +376,9 @@ bsd_alloc(options, opt_len, decomp) if (!decomp) { db->lens = NULL; } else { - db->lens = (u_short *) kmem_alloc((maxmaxcode+1) * sizeof(db->lens[0]), - KMEM_NOSLEEP); + db->lens = (u_short *) ALLOCATE((maxmaxcode+1) * sizeof(db->lens[0])); if (!db->lens) { - kmem_free(db, newlen); + FREE(db, newlen); return NULL; } } @@ -383,8 +399,8 @@ bsd_free(state) struct bsd_db *db = (struct bsd_db *) state; if (db->lens) - kmem_free(db->lens, (db->maxmaxcode+1) * sizeof(db->lens[0])); - kmem_free(db, db->totlen); + FREE(db->lens, (db->maxmaxcode+1) * sizeof(db->lens[0])); + FREE(db, db->totlen); } static void * @@ -407,14 +423,14 @@ bsd_decomp_alloc(options, opt_len) * Initialize the database. */ static int -bsd_init(db, options, opt_len, unit, mru, debug, decomp) +bsd_init(db, options, opt_len, unit, hdrlen, mru, debug, decomp) struct bsd_db *db; u_char *options; - int opt_len, unit, mru, debug, decomp; + int opt_len, unit, hdrlen, mru, debug, decomp; { int i; - if (opt_len != 3 || options[0] != 0x21 || options[1] != 3 + if (opt_len != 3 || options[0] != CI_BSD_COMPRESS || options[1] != 3 || BSD_VERSION(options[2]) != BSD_CURRENT_VERSION || BSD_NBITS(options[2]) != db->maxbits || decomp && db->lens == NULL) @@ -432,6 +448,7 @@ bsd_init(db, options, opt_len, unit, mru, debug, decomp) } db->unit = unit; + db->hdrlen = hdrlen; db->mru = mru; if (debug) db->debug = 1; @@ -442,23 +459,23 @@ bsd_init(db, options, opt_len, unit, mru, debug, decomp) } static int -bsd_comp_init(state, options, opt_len, unit, debug) +bsd_comp_init(state, options, opt_len, unit, hdrlen, debug) void *state; u_char *options; - int opt_len, unit, debug; + int opt_len, unit, hdrlen, debug; { return bsd_init((struct bsd_db *) state, options, opt_len, - unit, 0, debug, 0); + unit, hdrlen, 0, debug, 0); } static int -bsd_decomp_init(state, options, opt_len, unit, mru, debug) +bsd_decomp_init(state, options, opt_len, unit, hdrlen, mru, debug) void *state; u_char *options; - int opt_len, unit, mru, debug; + int opt_len, unit, hdrlen, mru, debug; { return bsd_init((struct bsd_db *) state, options, opt_len, - unit, mru, debug, 1); + unit, hdrlen, mru, debug, 1); } @@ -466,6 +483,8 @@ bsd_decomp_init(state, options, opt_len, unit, mru, debug) * compress a packet * One change from the BSD compress command is that when the * code size expands, we do not output a bunch of padding. + * + * N.B. at present, we ignore the hdrlen specified in the comp_init call. */ static int /* new slen */ bsd_compress(state, mretp, mp, slen, maxolen) @@ -881,9 +900,10 @@ bsd_decompress(state, cmsg, dmpp) /* * Allocate one message block to start with. */ - if ((dmsg = allocb(DECOMP_CHUNK, BPRI_MED)) == NULL) + if ((dmsg = allocb(DECOMP_CHUNK + db->hdrlen, BPRI_MED)) == NULL) return DECOMP_ERROR; mret = dmsg; + dmsg->b_wptr += db->hdrlen; dmsg->b_rptr = wptr = dmsg->b_wptr; /* Fill in the ppp header, but not the last byte of the protocol @@ -1096,3 +1116,4 @@ bsd_decompress(state, cmsg, dmpp) *dmpp = mret; return DECOMP_OK; } +#endif /* DO_BSD_COMPRESS */