define CBCP protocol value

[ppp.git] / netbsd-1.1 / ppp-deflate.c

diff --git a/netbsd-1.1/ppp-deflate.c b/netbsd-1.1/ppp-deflate.c
index cb4bd7ee52b152ad48760fcbcfb79850a5721983..6470235a9c803e67572f0c9b80f79bb8dd1c006b 100644 (file)
--- 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.4 1996/10/08 04:38:06 paulus Exp $       */
 
 /*
  * ppp_deflate.c - interface the zlib procedures for Deflate compression
@@ -41,6 +41,12 @@
 
 #if DO_DEFLATE
 
+#ifdef FreeBSD
+#define inflate        inflate_ppp     /* FreeBSD already has an inflate :-( */
+#endif
+
+#define DEFLATE_DEBUG  1
+
 /*
  * State for a Deflate (de)compressor.
  */
@@ -531,7 +537,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 +586,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 +640,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;