diff options
Diffstat (limited to 'compress.c')
-rw-r--r-- | compress.c | 46 |
1 files changed, 26 insertions, 20 deletions
diff --git a/compress.c b/compress.c index 463e7374e..544811c19 100644 --- a/compress.c +++ b/compress.c | |||
@@ -14,7 +14,7 @@ | |||
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include "includes.h" | 16 | #include "includes.h" |
17 | RCSID("$Id: compress.c,v 1.2 1999/11/24 13:26:22 damien Exp $"); | 17 | RCSID("$Id: compress.c,v 1.3 1999/11/25 00:54:59 damien Exp $"); |
18 | 18 | ||
19 | #include "ssh.h" | 19 | #include "ssh.h" |
20 | #include "buffer.h" | 20 | #include "buffer.h" |
@@ -23,8 +23,10 @@ RCSID("$Id: compress.c,v 1.2 1999/11/24 13:26:22 damien Exp $"); | |||
23 | static z_stream incoming_stream; | 23 | static z_stream incoming_stream; |
24 | static z_stream outgoing_stream; | 24 | static z_stream outgoing_stream; |
25 | 25 | ||
26 | /* Initializes compression; level is compression level from 1 to 9 | 26 | /* |
27 | (as in gzip). */ | 27 | * Initializes compression; level is compression level from 1 to 9 |
28 | * (as in gzip). | ||
29 | */ | ||
28 | 30 | ||
29 | void | 31 | void |
30 | buffer_compress_init(int level) | 32 | buffer_compress_init(int level) |
@@ -53,13 +55,14 @@ buffer_compress_uninit() | |||
53 | deflateEnd(&outgoing_stream); | 55 | deflateEnd(&outgoing_stream); |
54 | } | 56 | } |
55 | 57 | ||
56 | /* Compresses the contents of input_buffer into output_buffer. All | 58 | /* |
57 | packets compressed using this function will form a single | 59 | * Compresses the contents of input_buffer into output_buffer. All packets |
58 | compressed data stream; however, data will be flushed at the end of | 60 | * compressed using this function will form a single compressed data stream; |
59 | every call so that each output_buffer can be decompressed | 61 | * however, data will be flushed at the end of every call so that each |
60 | independently (but in the appropriate order since they together | 62 | * output_buffer can be decompressed independently (but in the appropriate |
61 | form a single compression stream) by the receiver. This appends | 63 | * order since they together form a single compression stream) by the |
62 | the compressed data to the output buffer. */ | 64 | * receiver. This appends the compressed data to the output buffer. |
65 | */ | ||
63 | 66 | ||
64 | void | 67 | void |
65 | buffer_compress(Buffer * input_buffer, Buffer * output_buffer) | 68 | buffer_compress(Buffer * input_buffer, Buffer * output_buffer) |
@@ -106,13 +109,14 @@ buffer_compress(Buffer * input_buffer, Buffer * output_buffer) | |||
106 | while (outgoing_stream.avail_out == 0); | 109 | while (outgoing_stream.avail_out == 0); |
107 | } | 110 | } |
108 | 111 | ||
109 | /* Uncompresses the contents of input_buffer into output_buffer. All | 112 | /* |
110 | packets uncompressed using this function will form a single | 113 | * Uncompresses the contents of input_buffer into output_buffer. All packets |
111 | compressed data stream; however, data will be flushed at the end of | 114 | * uncompressed using this function will form a single compressed data |
112 | every call so that each output_buffer. This must be called for the | 115 | * stream; however, data will be flushed at the end of every call so that |
113 | same size units that the buffer_compress was called, and in the | 116 | * each output_buffer. This must be called for the same size units that the |
114 | same order that buffers compressed with that. This appends the | 117 | * buffer_compress was called, and in the same order that buffers compressed |
115 | uncompressed data to the output buffer. */ | 118 | * with that. This appends the uncompressed data to the output buffer. |
119 | */ | ||
116 | 120 | ||
117 | void | 121 | void |
118 | buffer_uncompress(Buffer * input_buffer, Buffer * output_buffer) | 122 | buffer_uncompress(Buffer * input_buffer, Buffer * output_buffer) |
@@ -145,9 +149,11 @@ buffer_uncompress(Buffer * input_buffer, Buffer * output_buffer) | |||
145 | fatal("buffer_uncompress: inflate returned Z_STREAM_ERROR"); | 149 | fatal("buffer_uncompress: inflate returned Z_STREAM_ERROR"); |
146 | /* NOTREACHED */ | 150 | /* NOTREACHED */ |
147 | case Z_BUF_ERROR: | 151 | case Z_BUF_ERROR: |
148 | /* Comments in zlib.h say that we should keep | 152 | /* |
149 | calling inflate() until we get an error. This | 153 | * Comments in zlib.h say that we should keep calling |
150 | appears to be the error that we get. */ | 154 | * inflate() until we get an error. This appears to |
155 | * be the error that we get. | ||
156 | */ | ||
151 | return; | 157 | return; |
152 | case Z_MEM_ERROR: | 158 | case Z_MEM_ERROR: |
153 | fatal("buffer_uncompress: inflate returned Z_MEM_ERROR"); | 159 | fatal("buffer_uncompress: inflate returned Z_MEM_ERROR"); |