increase DEFLOOPBACKFAIL

[ppp.git] / modules / deflate.c

diff --git a/modules/deflate.c b/modules/deflate.c
index 405b404588777f1208784edf2f8d3ce7b08d992e..3be70d3d970b22d3939ccea761802c41775d8a0f 100644 (file)
--- a/modules/deflate.c
+++ b/modules/deflate.c
@@ -27,7 +27,7 @@
  * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
  * OR MODIFICATIONS.
  *
  * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
  * OR MODIFICATIONS.
  *

- * $Id: deflate.c,v 1.1 1996/01/18 03:17:48 paulus Exp $
+ * $Id: deflate.c,v 1.4 1996/08/28 06:34:56 paulus Exp $

  */
 
 #ifdef AIX4
  */
 
 #ifdef AIX4


@@ -41,10 +41,17 @@
 
 #define PACKETPTR      mblk_t *
 #include <net/ppp-comp.h>
 
 #define PACKETPTR      mblk_t *
 #include <net/ppp-comp.h>

+
+#ifdef __osf__
+#include "zlib.h"
+#else

 #include "common/zlib.h"
 #include "common/zlib.h"

+#endif

 
 #if DO_DEFLATE
 
 
 #if DO_DEFLATE
 

+#define DEFLATE_DEBUG  1
+

 /*
  * State for a Deflate (de)compressor.
  */
 /*
  * State for a Deflate (de)compressor.
  */


@@ -61,8 +68,8 @@ struct deflate_state {
 
 #define DEFLATE_OVHD   2               /* Deflate overhead/packet */
 
 
 #define DEFLATE_OVHD   2               /* Deflate overhead/packet */
 

-static void    *zalloc __P((void *, u_int items, u_int size));
-static void    zfree __P((void *, void *ptr, u_int nb));
+static void    *z_alloc __P((void *, u_int items, u_int size));
+static void    z_free __P((void *, void *ptr, u_int nb));

 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_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));


@@ -105,16 +112,20 @@ struct compressor ppp_deflate = {
 /*
  * Space allocation and freeing routines for use by zlib routines.
  */
 /*
  * Space allocation and freeing routines for use by zlib routines.
  */

-void *
-zalloc(notused, items, size)
+static void *
+z_alloc(notused, items, size)

     void *notused;
     u_int items, size;
 {
     void *notused;
     u_int items, size;
 {

+#ifdef __osf__
+    return ALLOC_SLEEP(items * size);
+#else

     return ALLOC_NOSLEEP(items * size);
     return ALLOC_NOSLEEP(items * size);

+#endif

 }
 
 }
 

-void
-zfree(notused, ptr, nbytes)
+static void
+z_free(notused, ptr, nbytes)

     void *notused;
     void *ptr;
     u_int nbytes;
     void *notused;
     void *ptr;
     u_int nbytes;


@@ -147,8 +158,8 @@ z_comp_alloc(options, opt_len)
        return NULL;
 
     state->strm.next_in = NULL;
        return NULL;
 
     state->strm.next_in = NULL;

-    state->strm.zalloc = zalloc;
-    state->strm.zfree = zfree;
+    state->strm.zalloc = (alloc_func) z_alloc;
+    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) {
        FREE(state, sizeof(*state));
     if (deflateInit2(&state->strm, Z_DEFAULT_COMPRESSION, DEFLATE_METHOD_VAL,
                     -w_size, 8, Z_DEFAULT_STRATEGY, DEFLATE_OVHD+2) != Z_OK) {
        FREE(state, sizeof(*state));


@@ -205,7 +216,7 @@ z_comp_reset(arg)
     deflateReset(&state->strm);
 }
 
     deflateReset(&state->strm);
 }
 

-int
+static int

 z_compress(arg, mret, mp, orig_len, maxolen)
     void *arg;
     mblk_t **mret;             /* compressed packet (out) */
 z_compress(arg, mret, mp, orig_len, maxolen)
     void *arg;
     mblk_t **mret;             /* compressed packet (out) */


@@ -379,8 +390,8 @@ z_decomp_alloc(options, opt_len)
        return NULL;
 
     state->strm.next_out = NULL;
        return NULL;
 
     state->strm.next_out = NULL;

-    state->strm.zalloc = zalloc;
-    state->strm.zfree = zfree;
+    state->strm.zalloc = (alloc_func) z_alloc;
+    state->strm.zfree = (free_func) z_free;

     if (inflateInit2(&state->strm, -w_size) != Z_OK) {
        FREE(state, sizeof(*state));
        return NULL;
     if (inflateInit2(&state->strm, -w_size) != Z_OK) {
        FREE(state, sizeof(*state));
        return NULL;


@@ -453,7 +464,7 @@ z_decomp_reset(arg)
  * bug, so we return DECOMP_FATALERROR for them in order to turn off
  * compression, even though they are detected by inspecting the input.
  */
  * bug, so we return DECOMP_FATALERROR for them in order to turn off
  * compression, even though they are detected by inspecting the input.
  */

-int
+static int

 z_decompress(arg, mi, mop)
     void *arg;
     mblk_t *mi, **mop;
 z_decompress(arg, mi, mop)
     void *arg;
     mblk_t *mi, **mop;


@@ -480,7 +491,9 @@ z_decompress(arg, mi, mop)
     /* Check the sequence number. */
     seq = (hdr[PPP_HDRLEN] << 8) + hdr[PPP_HDRLEN+1];
     if (seq != state->seqno) {
     /* Check the sequence number. */
     seq = (hdr[PPP_HDRLEN] << 8) + hdr[PPP_HDRLEN+1];
     if (seq != state->seqno) {

+#if !DEFLATE_DEBUG

        if (state->debug)
        if (state->debug)

+#endif

            printf("z_decompress%d: bad seq # %d, expected %d\n",
                   state->unit, seq, state->seqno);
        return DECOMP_ERROR;
            printf("z_decompress%d: bad seq # %d, expected %d\n",
                   state->unit, seq, state->seqno);
        return DECOMP_ERROR;


@@ -526,7 +539,9 @@ z_decompress(arg, mi, mop)
     for (;;) {
        r = inflate(&state->strm, flush);
        if (r != Z_OK) {
     for (;;) {
        r = inflate(&state->strm, flush);
        if (r != Z_OK) {

+#if !DEFLATE_DEBUG

            if (state->debug)
            if (state->debug)

+#endif

                printf("z_decompress%d: inflate returned %d (%s)\n",
                       state->unit, r, (state->strm.msg? state->strm.msg: ""));
            freemsg(mo_head);
                printf("z_decompress%d: inflate returned %d (%s)\n",
                       state->unit, r, (state->strm.msg? state->strm.msg: ""));
            freemsg(mo_head);


@@ -574,6 +589,12 @@ z_decompress(arg, mi, mop)
     mo->b_wptr += ospace - state->strm.avail_out;
     olen += ospace - state->strm.avail_out;
 
     mo->b_wptr += ospace - state->strm.avail_out;
     olen += 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++;
     state->stats.comp_bytes += rlen;
     state->stats.unc_bytes += olen;
     state->stats.unc_packets++;
     state->stats.comp_bytes += rlen;


@@ -627,10 +648,11 @@ z_incomp(arg, mi)
        r = inflateIncomp(&state->strm);
        if (r != Z_OK) {
            /* gak! */
        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: ""));
                printf("z_incomp%d: inflateIncomp returned %d (%s)\n",
                       state->unit, r, (state->strm.msg? state->strm.msg: ""));

-           }

            return;
        }
        mi = mi->b_cont;
            return;
        }
        mi = mi->b_cont;