-/* $Id: ppp-deflate.c,v 1.1 1996/07/01 01:24:27 paulus Exp $ */
+/* $Id: ppp-deflate.c,v 1.3 1997/04/30 06:00:45 paulus Exp $ */
/*
* ppp_deflate.c - interface the zlib procedures for Deflate compression
z_comp_stats, /* decomp_stat */
};
+/*
+ * Some useful mbuf macros not in mbuf.h.
+ */
+#define M_IS_CLUSTER(m) ((m)->m_off > MMAXOFF)
+
+#define M_TRAILINGSPACE(m) \
+ ((M_IS_CLUSTER(m) ? (u_int)(m)->m_clptr + M_CLUSTERSZ : MSIZE) \
+ - ((m)->m_off + (m)->m_len))
+
/*
* Space allocation and freeing routines for use by zlib routines.
*/
if (w_size < DEFLATE_MIN_SIZE || w_size > DEFLATE_MAX_SIZE)
return NULL;
- MALLOC(state, struct deflate_state *, sizeof(struct deflate_state),
- M_DEVBUF, M_NOWAIT);
+ KM_ALLOC(state, struct deflate_state *, sizeof(struct deflate_state),
+ KM_DEVBUF, KM_NOARG);
if (state == NULL)
return NULL;
+ bzero(state, sizeof(struct deflate_state));
state->strm.next_in = NULL;
- state->strm.zalloc = zalloc;
- state->strm.zfree = zfree;
+ state->strm.zalloc = (alloc_func) zalloc;
+ state->strm.zalloc_init = (alloc_func) zalloc;
+ state->strm.zfree = (free_func) zfree;
if (deflateInit2(&state->strm, Z_DEFAULT_COMPRESSION, DEFLATE_METHOD_VAL,
-w_size, 8, Z_DEFAULT_STRATEGY, DEFLATE_OVHD+2) != Z_OK) {
- FREE(state, M_DEVBUF);
+ KM_FREE(state, KM_DEVBUF);
return NULL;
}
struct deflate_state *state = (struct deflate_state *) arg;
deflateEnd(&state->strm);
- FREE(state, M_DEVBUF);
+ KM_FREE(state, KM_DEVBUF);
}
static int
struct deflate_state *state = (struct deflate_state *) arg;
u_char *rptr, *wptr;
int proto, olen, wspace, r, flush;
- struct mbuf *m;
+ struct mbuf *m, *clp;
/*
* Check that the protocol is in the range we handle.
MGET(m, M_DONTWAIT, MT_DATA);
*mret = m;
if (m != NULL) {
+ if (maxolen + state->hdrlen > MLEN) {
+ /* MCLGET is not a single statement!!! */
+ MCLGET(m, clp)
+ }
m->m_len = 0;
- if (maxolen + state->hdrlen > MLEN)
- MCLGET(m, M_DONTWAIT);
wspace = M_TRAILINGSPACE(m);
- if (state->hdrlen + PPP_HDRLEN + 2 < wspace) {
- m->m_data += state->hdrlen;
+ if (state->hdrlen > 0 && state->hdrlen + PPP_HDRLEN + 2 < wspace) {
+ m->m_off += state->hdrlen;
wspace -= state->hdrlen;
}
wptr = mtod(m, u_char *);
MGET(m->m_next, M_DONTWAIT, MT_DATA);
m = m->m_next;
if (m != NULL) {
+ if (maxolen - olen > MLEN) {
+ MCLGET(m, clp)
+ }
m->m_len = 0;
- if (maxolen - olen > MLEN)
- MCLGET(m, M_DONTWAIT);
state->strm.next_out = mtod(m, u_char *);
state->strm.avail_out = wspace = M_TRAILINGSPACE(m);
}
if (w_size < DEFLATE_MIN_SIZE || w_size > DEFLATE_MAX_SIZE)
return NULL;
- MALLOC(state, struct deflate_state *, sizeof(struct deflate_state),
- M_DEVBUF, M_NOWAIT);
+ KM_ALLOC(state, struct deflate_state *, sizeof(struct deflate_state),
+ KM_DEVBUF, KM_NOARG);
if (state == NULL)
return NULL;
+ bzero(state, sizeof(struct deflate_state));
state->strm.next_out = NULL;
- state->strm.zalloc = zalloc;
- state->strm.zfree = zfree;
+ state->strm.zalloc = (alloc_func) zalloc;
+ state->strm.zalloc_init = (alloc_func) zalloc;
+ state->strm.zfree = (free_func) zfree;
if (inflateInit2(&state->strm, -w_size) != Z_OK) {
- FREE(state, M_DEVBUF);
+ KM_FREE(state, KM_DEVBUF);
return NULL;
}
struct deflate_state *state = (struct deflate_state *) arg;
inflateEnd(&state->strm);
- FREE(state, M_DEVBUF);
+ KM_FREE(state, KM_DEVBUF);
}
static int
struct mbuf *mi, **mop;
{
struct deflate_state *state = (struct deflate_state *) arg;
- struct mbuf *mo, *mo_head;
+ struct mbuf *mo, *mo_head, *clp;
u_char *rptr, *wptr;
int rlen, olen, ospace;
int seq, i, flush, r, decode_proto;
++state->seqno;
/* Allocate an output mbuf. */
- MGETHDR(mo, M_DONTWAIT, MT_DATA);
+ MGET(mo, M_DONTWAIT, MT_DATA);
if (mo == NULL)
return DECOMP_ERROR;
mo_head = mo;
- mo->m_len = 0;
mo->m_next = NULL;
- MCLGET(mo, M_DONTWAIT);
+ MCLGET(mo, clp)
+ mo->m_len = 0;
ospace = M_TRAILINGSPACE(mo);
- if (state->hdrlen + PPP_HDRLEN < ospace) {
- mo->m_data += state->hdrlen;
+ if (state->hdrlen > 0 && state->hdrlen + PPP_HDRLEN < ospace) {
+ mo->m_off += state->hdrlen;
ospace -= state->hdrlen;
}
m_freem(mo_head);
return DECOMP_ERROR;
}
- MCLGET(mo, M_DONTWAIT);
+ MCLGET(mo, clp)
+ mo->m_len = 0;
state->strm.next_out = mtod(mo, u_char *);
state->strm.avail_out = ospace = M_TRAILINGSPACE(mo);
}