1999-10-27 03:42:43 +00:00
|
|
|
/*
|
2000-04-16 01:18:38 +00:00
|
|
|
*
|
1999-11-24 13:26:21 +00:00
|
|
|
* compress.c
|
2000-04-16 01:18:38 +00:00
|
|
|
*
|
1999-11-24 13:26:21 +00:00
|
|
|
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
2000-04-16 01:18:38 +00:00
|
|
|
*
|
1999-11-24 13:26:21 +00:00
|
|
|
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
|
|
|
* All rights reserved
|
2000-04-16 01:18:38 +00:00
|
|
|
*
|
1999-11-24 13:26:21 +00:00
|
|
|
* Created: Wed Oct 25 22:12:46 1995 ylo
|
2000-04-16 01:18:38 +00:00
|
|
|
*
|
1999-11-24 13:26:21 +00:00
|
|
|
* Interface to packet compression for ssh.
|
2000-04-16 01:18:38 +00:00
|
|
|
*
|
1999-11-24 13:26:21 +00:00
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
|
|
|
|
#include "includes.h"
|
2000-06-22 11:32:31 +00:00
|
|
|
RCSID("$OpenBSD: compress.c,v 1.8 2000/06/20 01:39:40 markus Exp $");
|
1999-10-27 03:42:43 +00:00
|
|
|
|
|
|
|
#include "ssh.h"
|
|
|
|
#include "buffer.h"
|
|
|
|
#include "zlib.h"
|
|
|
|
|
|
|
|
static z_stream incoming_stream;
|
|
|
|
static z_stream outgoing_stream;
|
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* Initializes compression; level is compression level from 1 to 9
|
|
|
|
* (as in gzip).
|
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2000-04-16 01:18:38 +00:00
|
|
|
void
|
1999-11-24 13:26:21 +00:00
|
|
|
buffer_compress_init(int level)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
debug("Enabling compression at level %d.", level);
|
|
|
|
if (level < 1 || level > 9)
|
|
|
|
fatal("Bad compression level %d.", level);
|
|
|
|
inflateInit(&incoming_stream);
|
|
|
|
deflateInit(&outgoing_stream, level);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Frees any data structures allocated for compression. */
|
|
|
|
|
2000-04-16 01:18:38 +00:00
|
|
|
void
|
1999-11-24 13:26:21 +00:00
|
|
|
buffer_compress_uninit()
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
debug("compress outgoing: raw data %lu, compressed %lu, factor %.2f",
|
|
|
|
outgoing_stream.total_in, outgoing_stream.total_out,
|
|
|
|
outgoing_stream.total_in == 0 ? 0.0 :
|
|
|
|
(double) outgoing_stream.total_out / outgoing_stream.total_in);
|
|
|
|
debug("compress incoming: raw data %lu, compressed %lu, factor %.2f",
|
|
|
|
incoming_stream.total_out, incoming_stream.total_in,
|
|
|
|
incoming_stream.total_out == 0 ? 0.0 :
|
|
|
|
(double) incoming_stream.total_in / incoming_stream.total_out);
|
|
|
|
inflateEnd(&incoming_stream);
|
|
|
|
deflateEnd(&outgoing_stream);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* Compresses the contents of input_buffer into output_buffer. All packets
|
|
|
|
* compressed using this function will form a single compressed data stream;
|
|
|
|
* however, data will be flushed at the end of every call so that each
|
|
|
|
* output_buffer can be decompressed independently (but in the appropriate
|
|
|
|
* order since they together form a single compression stream) by the
|
|
|
|
* receiver. This appends the compressed data to the output buffer.
|
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2000-04-16 01:18:38 +00:00
|
|
|
void
|
1999-11-24 13:26:21 +00:00
|
|
|
buffer_compress(Buffer * input_buffer, Buffer * output_buffer)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
char buf[4096];
|
|
|
|
int status;
|
|
|
|
|
|
|
|
/* This case is not handled below. */
|
|
|
|
if (buffer_len(input_buffer) == 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* Input is the contents of the input buffer. */
|
2000-03-17 12:40:15 +00:00
|
|
|
outgoing_stream.next_in = (unsigned char *) buffer_ptr(input_buffer);
|
1999-11-24 13:26:21 +00:00
|
|
|
outgoing_stream.avail_in = buffer_len(input_buffer);
|
|
|
|
|
|
|
|
/* Loop compressing until deflate() returns with avail_out != 0. */
|
|
|
|
do {
|
|
|
|
/* Set up fixed-size output buffer. */
|
2000-03-17 12:40:15 +00:00
|
|
|
outgoing_stream.next_out = (unsigned char *)buf;
|
1999-11-24 13:26:21 +00:00
|
|
|
outgoing_stream.avail_out = sizeof(buf);
|
|
|
|
|
|
|
|
/* Compress as much data into the buffer as possible. */
|
|
|
|
status = deflate(&outgoing_stream, Z_PARTIAL_FLUSH);
|
|
|
|
switch (status) {
|
|
|
|
case Z_OK:
|
|
|
|
/* Append compressed data to output_buffer. */
|
|
|
|
buffer_append(output_buffer, buf,
|
2000-04-01 01:09:21 +00:00
|
|
|
sizeof(buf) - outgoing_stream.avail_out);
|
1999-11-24 13:26:21 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
fatal("buffer_compress: deflate returned %d", status);
|
|
|
|
/* NOTREACHED */
|
|
|
|
}
|
2000-04-01 01:09:21 +00:00
|
|
|
} while (outgoing_stream.avail_out == 0);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* Uncompresses the contents of input_buffer into output_buffer. All packets
|
|
|
|
* uncompressed using this function will form a single compressed data
|
|
|
|
* stream; however, data will be flushed at the end of every call so that
|
|
|
|
* each output_buffer. This must be called for the same size units that the
|
|
|
|
* buffer_compress was called, and in the same order that buffers compressed
|
|
|
|
* with that. This appends the uncompressed data to the output buffer.
|
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2000-04-16 01:18:38 +00:00
|
|
|
void
|
1999-11-24 13:26:21 +00:00
|
|
|
buffer_uncompress(Buffer * input_buffer, Buffer * output_buffer)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
char buf[4096];
|
|
|
|
int status;
|
|
|
|
|
2000-03-17 12:40:15 +00:00
|
|
|
incoming_stream.next_in = (unsigned char *) buffer_ptr(input_buffer);
|
1999-11-24 13:26:21 +00:00
|
|
|
incoming_stream.avail_in = buffer_len(input_buffer);
|
|
|
|
|
|
|
|
for (;;) {
|
2000-04-01 01:09:21 +00:00
|
|
|
/* Set up fixed-size output buffer. */
|
|
|
|
incoming_stream.next_out = (unsigned char *) buf;
|
|
|
|
incoming_stream.avail_out = sizeof(buf);
|
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
status = inflate(&incoming_stream, Z_PARTIAL_FLUSH);
|
|
|
|
switch (status) {
|
|
|
|
case Z_OK:
|
|
|
|
buffer_append(output_buffer, buf,
|
2000-04-01 01:09:21 +00:00
|
|
|
sizeof(buf) - incoming_stream.avail_out);
|
1999-11-24 13:26:21 +00:00
|
|
|
break;
|
|
|
|
case Z_BUF_ERROR:
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* Comments in zlib.h say that we should keep calling
|
|
|
|
* inflate() until we get an error. This appears to
|
|
|
|
* be the error that we get.
|
|
|
|
*/
|
1999-11-24 13:26:21 +00:00
|
|
|
return;
|
|
|
|
default:
|
|
|
|
fatal("buffer_uncompress: inflate returned %d", status);
|
2000-04-01 01:09:21 +00:00
|
|
|
/* NOTREACHED */
|
1999-11-24 13:26:21 +00:00
|
|
|
}
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
}
|