* OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
* OR MODIFICATIONS.
*
- * $Id: deflate.c,v 1.5 1997/04/30 05:43:39 paulus Exp $
+ * $Id: deflate.c,v 1.9 1999/01/19 23:58:35 paulus Exp $
*/
#ifdef AIX4
#ifdef __osf__
#include "zlib.h"
#else
-#include "common/zlib.h"
+#include "../common/zlib.h"
#endif
#if DO_DEFLATE
static void *z_alloc __P((void *, u_int items, u_int size));
static void *z_alloc_init __P((void *, u_int items, u_int size));
-static void z_free __P((void *, void *ptr, u_int nb));
+static void z_free __P((void *, void *ptr));
static void *z_comp_alloc __P((u_char *options, int opt_len));
static void *z_decomp_alloc __P((u_char *options, int opt_len));
static void z_comp_free __P((void *state));
static void z_comp_stats __P((void *state, struct compstat *stats));
/*
- * Procedures exported to if_ppp.c.
+ * Procedures exported to ppp_comp.c.
*/
struct compressor ppp_deflate = {
CI_DEFLATE, /* compress_proto */
z_comp_stats, /* decomp_stat */
};
+struct compressor ppp_deflate_draft = {
+ CI_DEFLATE_DRAFT, /* compress_proto */
+ z_comp_alloc, /* comp_alloc */
+ z_comp_free, /* comp_free */
+ z_comp_init, /* comp_init */
+ z_comp_reset, /* comp_reset */
+ z_compress, /* compress */
+ z_comp_stats, /* comp_stat */
+ z_decomp_alloc, /* decomp_alloc */
+ z_decomp_free, /* decomp_free */
+ z_decomp_init, /* decomp_init */
+ z_decomp_reset, /* decomp_reset */
+ z_decompress, /* decompress */
+ z_incomp, /* incomp */
+ z_comp_stats, /* decomp_stat */
+};
+
#define DECOMP_CHUNK 512
/*
* Space allocation and freeing routines for use by zlib routines.
*/
+struct zchunk {
+ u_int size;
+ u_int guard;
+};
+
+#define GUARD_MAGIC 0x77a6011a
+
static void *
z_alloc_init(notused, items, size)
void *notused;
u_int items, size;
{
+ struct zchunk *z;
+
+ size = items * size + sizeof(struct zchunk);
#ifdef __osf__
- return ALLOC_SLEEP(items * size);
+ z = (struct zchunk *) ALLOC_SLEEP(size);
#else
- return ALLOC_NOSLEEP(items * size);
+ z = (struct zchunk *) ALLOC_NOSLEEP(size);
#endif
+ z->size = size;
+ z->guard = GUARD_MAGIC;
+ return (void *) (z + 1);
}
static void *
void *notused;
u_int items, size;
{
- return ALLOC_NOSLEEP(items * size);
+ struct zchunk *z;
+
+ size = items * size + sizeof(struct zchunk);
+ z = (struct zchunk *) ALLOC_NOSLEEP(size);
+ z->size = size;
+ z->guard = GUARD_MAGIC;
+ return (void *) (z + 1);
}
static void
-z_free(notused, ptr, nbytes)
+z_free(notused, ptr)
void *notused;
void *ptr;
- u_int nbytes;
{
- FREE(ptr, nbytes);
+ struct zchunk *z = ((struct zchunk *) ptr) - 1;
+
+ if (z->guard != GUARD_MAGIC) {
+ printf("ppp: z_free of corrupted chunk at %x (%x, %x)\n",
+ z, z->size, z->guard);
+ return;
+ }
+ FREE(z, z->size);
}
/*
struct deflate_state *state;
int w_size;
- if (opt_len != CILEN_DEFLATE || options[0] != CI_DEFLATE
+ if (opt_len != CILEN_DEFLATE
+ || (options[0] != CI_DEFLATE && options[0] != CI_DEFLATE_DRAFT)
|| options[1] != CILEN_DEFLATE
|| DEFLATE_METHOD(options[2]) != DEFLATE_METHOD_VAL
|| options[3] != DEFLATE_CHK_SEQUENCE)
return NULL;
state->strm.next_in = NULL;
- state->strm.zalloc = (alloc_func) z_alloc;
- state->strm.zalloc_init = (alloc_func) z_alloc_init;
+ state->strm.zalloc = (alloc_func) z_alloc_init;
state->strm.zfree = (free_func) z_free;
if (deflateInit2(&state->strm, Z_DEFAULT_COMPRESSION, DEFLATE_METHOD_VAL,
- -w_size, 8, Z_DEFAULT_STRATEGY, DEFLATE_OVHD+2) != Z_OK) {
+ -w_size, 8, Z_DEFAULT_STRATEGY) != Z_OK) {
FREE(state, sizeof(*state));
return NULL;
}
+ state->strm.zalloc = (alloc_func) z_alloc;
state->w_size = w_size;
bzero(&state->stats, sizeof(state->stats));
return (void *) state;
{
struct deflate_state *state = (struct deflate_state *) arg;
- if (opt_len < CILEN_DEFLATE || options[0] != CI_DEFLATE
+ if (opt_len < CILEN_DEFLATE
+ || (options[0] != CI_DEFLATE && options[0] != CI_DEFLATE_DRAFT)
|| options[1] != CILEN_DEFLATE
|| DEFLATE_METHOD(options[2]) != DEFLATE_METHOD_VAL
|| DEFLATE_SIZE(options[2]) != state->w_size
/* Allocate one mblk initially. */
if (maxolen > orig_len)
maxolen = orig_len;
- wspace = maxolen < 4096? maxolen: 4096;
- m = allocb(wspace, BPRI_MED);
+ if (maxolen <= PPP_HDRLEN + 2) {
+ wspace = 0;
+ m = NULL;
+ } else {
+ wspace = maxolen + state->hdrlen;
+ if (wspace > 4096)
+ wspace = 4096;
+ m = allocb(wspace, BPRI_MED);
+ }
if (m != NULL) {
*mret = m;
if (state->hdrlen + PPP_HDRLEN + 2 < wspace) {
m->b_wptr += wspace;
olen += wspace;
wspace = maxolen - olen;
- if (wspace < 32)
- wspace = 32;
- else if (wspace > 4096)
- wspace = 4096;
- m->b_cont = allocb(wspace, BPRI_MED);
+ if (wspace <= 0) {
+ wspace = 0;
+ m->b_cont = NULL;
+ } else {
+ if (wspace < 32)
+ wspace = 32;
+ else if (wspace > 4096)
+ wspace = 4096;
+ m->b_cont = allocb(wspace, BPRI_MED);
+ }
m = m->b_cont;
if (m != NULL) {
state->strm.next_out = m->b_wptr;
}
}
}
- m->b_wptr += wspace - state->strm.avail_out;
- olen += wspace - state->strm.avail_out;
+ if (m != NULL) {
+ m->b_wptr += wspace - state->strm.avail_out;
+ olen += wspace - state->strm.avail_out;
+ }
/*
* See if we managed to reduce the size of the packet.
- * If the compressor just gave us a single zero byte, it means
- * the packet was incompressible.
*/
- if (olen < orig_len && m != NULL
- && !(olen == PPP_HDRLEN + 3 && *wptr == 0)) {
+ if (olen < orig_len && m != NULL) {
state->stats.comp_bytes += olen;
state->stats.comp_packets++;
} else {
struct deflate_state *state;
int w_size;
- if (opt_len != CILEN_DEFLATE || options[0] != CI_DEFLATE
+ if (opt_len != CILEN_DEFLATE
+ || (options[0] != CI_DEFLATE && options[0] != CI_DEFLATE_DRAFT)
|| options[1] != CILEN_DEFLATE
|| DEFLATE_METHOD(options[2]) != DEFLATE_METHOD_VAL
|| options[3] != DEFLATE_CHK_SEQUENCE)
return NULL;
state->strm.next_out = NULL;
- state->strm.zalloc = (alloc_func) z_alloc;
- state->strm.zalloc_init = (alloc_func) z_alloc_init;
+ state->strm.zalloc = (alloc_func) z_alloc_init;
state->strm.zfree = (free_func) z_free;
if (inflateInit2(&state->strm, -w_size) != Z_OK) {
FREE(state, sizeof(*state));
return NULL;
}
+ state->strm.zalloc = (alloc_func) z_alloc;
state->w_size = w_size;
bzero(&state->stats, sizeof(state->stats));
return (void *) state;
{
struct deflate_state *state = (struct deflate_state *) arg;
- if (opt_len < CILEN_DEFLATE || options[0] != CI_DEFLATE
+ if (opt_len < CILEN_DEFLATE
+ || (options[0] != CI_DEFLATE && options[0] != CI_DEFLATE_DRAFT)
|| options[1] != CILEN_DEFLATE
|| DEFLATE_METHOD(options[2]) != DEFLATE_METHOD_VAL
|| DEFLATE_SIZE(options[2]) != state->w_size
mo->b_rptr += state->hdrlen;
mo->b_wptr = wptr = mo->b_rptr;
ospace = DECOMP_CHUNK;
+ olen = 0;
/*
* Fill in the first part of the PPP header. The protocol field
state->strm.next_out = wptr + 3;
state->strm.avail_out = 1;
decode_proto = 1;
- olen = PPP_HDRLEN;
/*
* Call inflate, supplying more input or output as needed.
wptr[2] = wptr[3];
--state->strm.next_out;
++state->strm.avail_out;
- --olen;
}
decode_proto = 0;
} else {
projects / ppp.git / blobdiff