2011-02-17 11:47:40 +00:00
|
|
|
/* $OpenBSD: compress.c,v 1.26 2010/09/08 04:13:31 deraadt Exp $ */
|
2000-02-24 14:29:47 +00:00
|
|
|
/*
|
|
|
|
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
|
|
|
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
|
|
|
* All rights reserved
|
|
|
|
* Interface to packet compression for ssh.
|
2000-05-15 04:37:24 +00:00
|
|
|
*
|
2000-09-10 08:31:17 +00:00
|
|
|
* As far as I am concerned, the code I have written for this software
|
|
|
|
* can be used freely for any purpose. Any derived versions of this
|
|
|
|
* software must be clearly marked as such, and if the derived work is
|
|
|
|
* incompatible with the protocol description in the RFC file, it must be
|
|
|
|
* called by a name other than "ssh" or "Secure Shell".
|
2000-02-24 14:29:47 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include "includes.h"
|
2006-09-30 13:29:51 +00:00
|
|
|
|
|
|
|
#include <sys/types.h>
|
|
|
|
|
|
|
|
#include <stdarg.h>
|
2000-02-24 14:29:47 +00:00
|
|
|
|
2001-05-04 03:57:05 +00:00
|
|
|
#include "log.h"
|
2000-02-24 14:29:47 +00:00
|
|
|
#include "buffer.h"
|
2001-05-04 03:57:05 +00:00
|
|
|
#include "compress.h"
|
2000-02-24 14:29:47 +00:00
|
|
|
|
2011-02-17 11:47:40 +00:00
|
|
|
#include <zlib.h>
|
|
|
|
|
2002-06-23 14:01:54 +00:00
|
|
|
z_stream incoming_stream;
|
|
|
|
z_stream outgoing_stream;
|
2001-05-04 03:57:05 +00:00
|
|
|
static int compress_init_send_called = 0;
|
|
|
|
static int compress_init_recv_called = 0;
|
2002-06-23 14:01:54 +00:00
|
|
|
static int inflate_failed = 0;
|
|
|
|
static int deflate_failed = 0;
|
2000-02-24 14:29:47 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Initializes compression; level is compression level from 1 to 9
|
|
|
|
* (as in gzip).
|
|
|
|
*/
|
|
|
|
|
2000-05-15 04:37:24 +00:00
|
|
|
void
|
2001-05-04 03:57:05 +00:00
|
|
|
buffer_compress_init_send(int level)
|
2000-02-24 14:29:47 +00:00
|
|
|
{
|
2001-05-04 03:57:05 +00:00
|
|
|
if (compress_init_send_called == 1)
|
2002-03-18 09:55:03 +00:00
|
|
|
deflateEnd(&outgoing_stream);
|
2001-05-04 03:57:05 +00:00
|
|
|
compress_init_send_called = 1;
|
2000-02-24 14:29:47 +00:00
|
|
|
debug("Enabling compression at level %d.", level);
|
|
|
|
if (level < 1 || level > 9)
|
|
|
|
fatal("Bad compression level %d.", level);
|
|
|
|
deflateInit(&outgoing_stream, level);
|
|
|
|
}
|
2001-05-04 03:57:05 +00:00
|
|
|
void
|
|
|
|
buffer_compress_init_recv(void)
|
|
|
|
{
|
|
|
|
if (compress_init_recv_called == 1)
|
|
|
|
inflateEnd(&incoming_stream);
|
|
|
|
compress_init_recv_called = 1;
|
|
|
|
inflateInit(&incoming_stream);
|
|
|
|
}
|
2000-02-24 14:29:47 +00:00
|
|
|
|
|
|
|
/* Frees any data structures allocated for compression. */
|
|
|
|
|
2000-05-15 04:37:24 +00:00
|
|
|
void
|
2001-05-04 03:57:05 +00:00
|
|
|
buffer_compress_uninit(void)
|
2000-02-24 14:29:47 +00:00
|
|
|
{
|
2004-02-26 10:38:49 +00:00
|
|
|
debug("compress outgoing: raw data %llu, compressed %llu, factor %.2f",
|
|
|
|
(unsigned long long)outgoing_stream.total_in,
|
|
|
|
(unsigned long long)outgoing_stream.total_out,
|
2002-03-18 09:55:03 +00:00
|
|
|
outgoing_stream.total_in == 0 ? 0.0 :
|
|
|
|
(double) outgoing_stream.total_out / outgoing_stream.total_in);
|
2004-02-26 10:38:49 +00:00
|
|
|
debug("compress incoming: raw data %llu, compressed %llu, factor %.2f",
|
|
|
|
(unsigned long long)incoming_stream.total_out,
|
|
|
|
(unsigned long long)incoming_stream.total_in,
|
2002-03-18 09:55:03 +00:00
|
|
|
incoming_stream.total_out == 0 ? 0.0 :
|
|
|
|
(double) incoming_stream.total_in / incoming_stream.total_out);
|
2002-06-23 14:01:54 +00:00
|
|
|
if (compress_init_recv_called == 1 && inflate_failed == 0)
|
2001-05-04 03:57:05 +00:00
|
|
|
inflateEnd(&incoming_stream);
|
2002-06-23 14:01:54 +00:00
|
|
|
if (compress_init_send_called == 1 && deflate_failed == 0)
|
2001-05-04 03:57:05 +00:00
|
|
|
deflateEnd(&outgoing_stream);
|
2000-02-24 14:29:47 +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.
|
|
|
|
*/
|
|
|
|
|
2000-05-15 04:37:24 +00:00
|
|
|
void
|
2000-02-24 14:29:47 +00:00
|
|
|
buffer_compress(Buffer * input_buffer, Buffer * output_buffer)
|
|
|
|
{
|
2002-03-18 09:55:03 +00:00
|
|
|
u_char buf[4096];
|
2000-02-24 14:29:47 +00:00
|
|
|
int status;
|
|
|
|
|
|
|
|
/* This case is not handled below. */
|
|
|
|
if (buffer_len(input_buffer) == 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* Input is the contents of the input buffer. */
|
2002-03-18 09:55:03 +00:00
|
|
|
outgoing_stream.next_in = buffer_ptr(input_buffer);
|
2000-02-24 14:29:47 +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. */
|
2002-03-18 09:55:03 +00:00
|
|
|
outgoing_stream.next_out = buf;
|
2000-02-24 14:29:47 +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-05-15 04:37:24 +00:00
|
|
|
sizeof(buf) - outgoing_stream.avail_out);
|
2000-02-24 14:29:47 +00:00
|
|
|
break;
|
|
|
|
default:
|
2002-06-23 14:01:54 +00:00
|
|
|
deflate_failed = 1;
|
2000-02-24 14:29:47 +00:00
|
|
|
fatal("buffer_compress: deflate returned %d", status);
|
|
|
|
/* NOTREACHED */
|
|
|
|
}
|
2000-05-15 04:37:24 +00:00
|
|
|
} while (outgoing_stream.avail_out == 0);
|
2000-02-24 14:29:47 +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.
|
|
|
|
*/
|
|
|
|
|
2000-05-15 04:37:24 +00:00
|
|
|
void
|
2000-02-24 14:29:47 +00:00
|
|
|
buffer_uncompress(Buffer * input_buffer, Buffer * output_buffer)
|
|
|
|
{
|
2002-03-18 09:55:03 +00:00
|
|
|
u_char buf[4096];
|
2000-02-24 14:29:47 +00:00
|
|
|
int status;
|
|
|
|
|
2002-03-18 09:55:03 +00:00
|
|
|
incoming_stream.next_in = buffer_ptr(input_buffer);
|
2000-02-24 14:29:47 +00:00
|
|
|
incoming_stream.avail_in = buffer_len(input_buffer);
|
|
|
|
|
|
|
|
for (;;) {
|
2000-05-15 04:37:24 +00:00
|
|
|
/* Set up fixed-size output buffer. */
|
2002-03-18 09:55:03 +00:00
|
|
|
incoming_stream.next_out = buf;
|
2000-05-15 04:37:24 +00:00
|
|
|
incoming_stream.avail_out = sizeof(buf);
|
|
|
|
|
2000-02-24 14:29:47 +00:00
|
|
|
status = inflate(&incoming_stream, Z_PARTIAL_FLUSH);
|
|
|
|
switch (status) {
|
|
|
|
case Z_OK:
|
|
|
|
buffer_append(output_buffer, buf,
|
2000-05-15 04:37:24 +00:00
|
|
|
sizeof(buf) - incoming_stream.avail_out);
|
2000-02-24 14:29:47 +00:00
|
|
|
break;
|
|
|
|
case Z_BUF_ERROR:
|
|
|
|
/*
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
return;
|
|
|
|
default:
|
2002-06-23 14:01:54 +00:00
|
|
|
inflate_failed = 1;
|
2000-02-24 14:29:47 +00:00
|
|
|
fatal("buffer_uncompress: inflate returned %d", status);
|
2000-05-15 04:37:24 +00:00
|
|
|
/* NOTREACHED */
|
2000-02-24 14:29:47 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|