X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=netbsd-1.1%2Fppp-deflate.c;h=9328b253858db57927e2f310b499d4773e550097;hp=cb4bd7ee52b152ad48760fcbcfb79850a5721983;hb=f0dd14eb17e2f9efc17a3bb38731c12f98223e29;hpb=d017f904e9ba71b481f4a123b60cd9fc46d27e0a diff --git a/netbsd-1.1/ppp-deflate.c b/netbsd-1.1/ppp-deflate.c index cb4bd7e..9328b25 100644 --- a/netbsd-1.1/ppp-deflate.c +++ b/netbsd-1.1/ppp-deflate.c @@ -1,4 +1,4 @@ -/* $Id: ppp-deflate.c,v 1.2 1996/04/04 03:23:09 paulus Exp $ */ +/* $Id: ppp-deflate.c,v 1.5 1997/03/04 03:33:28 paulus Exp $ */ /* * ppp_deflate.c - interface the zlib procedures for Deflate compression @@ -41,6 +41,8 @@ #if DO_DEFLATE +#define DEFLATE_DEBUG 1 + /* * State for a Deflate (de)compressor. */ @@ -531,7 +533,9 @@ z_decompress(arg, mi, mop) for (;;) { r = inflate(&state->strm, flush); if (r != Z_OK) { +#if !DEFLATE_DEBUG if (state->debug) +#endif printf("z_decompress%d: inflate returned %d (%s)\n", state->unit, r, (state->strm.msg? state->strm.msg: "")); m_freem(mo_head); @@ -578,6 +582,11 @@ z_decompress(arg, mi, mop) return DECOMP_ERROR; } olen += (mo->m_len = ospace - state->strm.avail_out); +#if DEFLATE_DEBUG + if (olen > state->mru + PPP_HDRLEN) + printf("ppp_deflate%d: exceeded mru (%d > %d)\n", + state->unit, olen, state->mru + PPP_HDRLEN); +#endif state->stats.unc_bytes += olen; state->stats.unc_packets++; @@ -627,10 +636,11 @@ z_incomp(arg, mi) r = inflateIncomp(&state->strm); if (r != Z_OK) { /* gak! */ - if (state->debug) { +#if !DEFLATE_DEBUG + if (state->debug) +#endif printf("z_incomp%d: inflateIncomp returned %d (%s)\n", state->unit, r, (state->strm.msg? state->strm.msg: "")); - } return; } mi = mi->m_next;