Support old draft rfc deflate number.

This commit is contained in:
Paul Mackerras 1998-03-24 23:48:04 +00:00
parent c583c6051d
commit dd94e61cfa

View File

@ -1,4 +1,4 @@
/* $Id: ppp-deflate.c,v 1.7 1997/11/27 06:06:31 paulus Exp $ */
/* $Id: ppp-deflate.c,v 1.8 1998/03/24 23:48:04 paulus Exp $ */
/*
* ppp_deflate.c - interface the zlib procedures for Deflate compression
@ -98,6 +98,23 @@ struct compressor ppp_deflate = {
z_comp_stats, /* decomp_stat */
};
struct compressor ppp_deflate = {
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 */
};
/*
* Space allocation and freeing routines for use by zlib routines.
*/
@ -131,7 +148,8 @@ z_comp_alloc(options, opt_len)
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)
@ -177,7 +195,8 @@ z_comp_init(arg, options, opt_len, unit, hdrlen, debug)
{
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
@ -362,7 +381,8 @@ z_decomp_alloc(options, opt_len)
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)
@ -407,7 +427,8 @@ z_decomp_init(arg, options, opt_len, unit, hdrlen, mru, debug)
{
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